[dpdk-dev] [PATCH v2] net/virtio: packed ring notification data feature support

[Cheng Jiang]

This patch supports the feature that the driver passes extra data
(besides identifying the virtqueue) in its device notifications.

Signed-off-by: Cheng Jiang 
---

v2:
* Removed rte_unused attribute in *hw.
* Added some comments on notify_data.

 drivers/net/virtio/virtio_ethdev.h |  3 ++-
 drivers/net/virtio/virtio_pci.c| 27 +--
 drivers/net/virtio/virtio_pci.h|  6 ++
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/drivers/net/virtio/virtio_ethdev.h 
b/drivers/net/virtio/virtio_ethdev.h
index a10111758..cd8947656 100644
--- a/drivers/net/virtio/virtio_ethdev.h
+++ b/drivers/net/virtio/virtio_ethdev.h
@@ -36,7 +36,8 @@
 1ULL << VIRTIO_F_IN_ORDER| \
 1ULL << VIRTIO_F_RING_PACKED | \
 1ULL << VIRTIO_F_IOMMU_PLATFORM  | \
-1ULL << VIRTIO_F_ORDER_PLATFORM)
+1ULL << VIRTIO_F_ORDER_PLATFORM  | \
+1ULL << VIRTIO_F_NOTIFICATION_DATA)
 
 #define VIRTIO_PMD_SUPPORTED_GUEST_FEATURES\
(VIRTIO_PMD_DEFAULT_GUEST_FEATURES |\
diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
index 4468e89cb..8b4e001a1 100644
--- a/drivers/net/virtio/virtio_pci.c
+++ b/drivers/net/virtio/virtio_pci.c
@@ -416,9 +416,32 @@ modern_del_queue(struct virtio_hw *hw, struct virtqueue 
*vq)
 }
 
 static void
-modern_notify_queue(struct virtio_hw *hw __rte_unused, struct virtqueue *vq)
+modern_notify_queue(struct virtio_hw *hw, struct virtqueue *vq)
 {
-   rte_write16(vq->vq_queue_index, vq->notify_addr);
+   uint32_t notify_data;
+
+   if (!vtpci_with_feature(hw, VIRTIO_F_NOTIFICATION_DATA)) {
+   rte_write16(vq->vq_queue_index, vq->notify_addr);
+   return;
+   }
+
+   if (vtpci_with_feature(hw, VIRTIO_F_RING_PACKED)) {
+   /*
+* Bit[0:15]: vq queue index
+* Bit[16:30]: avail index
+* Bit[31]: avail wrap counter
+*/
+   notify_data = uint32_t)vq->vq_packed.used_wrap_counter << 
15) |
+   vq->vq_avail_idx) << 16) | vq->vq_queue_index;
+   } else {
+   /*
+* Bit[0:15]: vq queue index
+* Bit[16:31]: avail index
+*/
+   notify_data = ((uint32_t)vq->vq_avail_idx << 16) |
+   vq->vq_queue_index;
+   }
+   rte_write32(notify_data, vq->notify_addr);
 }
 
 const struct virtio_pci_ops modern_ops = {
diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h
index a38cb45ad..7433d2f08 100644
--- a/drivers/net/virtio/virtio_pci.h
+++ b/drivers/net/virtio/virtio_pci.h
@@ -135,6 +135,12 @@ struct virtnet_ctl;
  */
 #define VIRTIO_F_ORDER_PLATFORM 36
 
+/*
+ * This feature indicates that the driver passes extra data (besides
+ * identifying the virtqueue) in its device notifications.
+ */
+#define VIRTIO_F_NOTIFICATION_DATA 38
+
 /* The Guest publishes the used index for which it expects an interrupt
  * at the end of the avail ring. Host should ignore the avail->flags field. */
 /* The Host publishes the avail index for which it expects a kick
-- 
2.17.1

Re: [dpdk-dev] [PATCH 2/2] devtools: add path to additional shared object files

[David Marchand]

On Wed, Dec 18, 2019 at 6:39 AM Ruifeng Wang  wrote:
>
> librte_mempool_ring.so and librte_pmd_null.so are in 'drivers' folder.
> Add 'drivers' into LD_LIBRARY_PATH so that testpmd can find and make
> use of these shared libraries.
>
> Signed-off-by: Ruifeng Wang 
> Reviewed-by: Gavin Hu 
> ---
>  devtools/test-null.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/devtools/test-null.sh b/devtools/test-null.sh
> index f39af2c06..548de8113 100755
> --- a/devtools/test-null.sh
> +++ b/devtools/test-null.sh
> @@ -20,7 +20,7 @@ if [ ! -f "$testpmd" ] ; then
>  fi
>
>  if ldd $testpmd | grep -q librte_ ; then
> -   export LD_LIBRARY_PATH=$build/lib:$LD_LIBRARY_PATH
> +   export LD_LIBRARY_PATH=$build/drivers:$build/lib:$LD_LIBRARY_PATH
> libs='-d librte_mempool_ring.so -d librte_pmd_null.so'
>  else
> libs=
> --
> 2.17.1
>

I'm surprised to see this.
So far, the CI ran fine without it, so something is different in the
environment.

I can see that the RPATH entry disappeared from the testpmd binary.
Xenial:
# readelf -d build/app/dpdk-testpmd |grep RPATH
 0x000f (RPATH)  Library rpath:
[$ORIGIN/../lib:$ORIGIN/../drivers:X]

(not sure what  purpose is, but different topic)

Bionic:
# readelf -d build/app/dpdk-testpmd |grep RPATH

Adding Bruce and Kevin, as I think this is the same issue than:
http://mails.dpdk.org/archives/dev/2019-December/153627.html
Could it be a change in meson?


--
David Marchand

Re: [dpdk-dev] [PATCH v2] net/i40e: always re-program promiscuous mode on VF interface

[Eelco Chaudron]

Thanks!



On 18 Dec 2019, at 3:57, Ye Xiaolong wrote:


On 12/18, Zhang, Xiao wrote:



-Original Message-
From: Eelco Chaudron [mailto:echau...@redhat.com]
Sent: Tuesday, November 19, 2019 9:45 PM
To: Xing, Beilei ; Zhang, Qi Z 


Cc: Zhang, Xiao ; dev@dpdk.org
Subject: [PATCH v2] net/i40e: always re-program promiscuous mode on 
VF

interface

During a kernel PF reset, this event is propagated to the VF.
The DPDK VF PMD will execute the reset task before the PF is done 
with his. This
results in the admin queue message not being responded to leaving 
the port in

"promiscuous" mode.

This patch makes sure the promiscuous mode is configured 
independently of the

current admin state.

Signed-off-by: Eelco Chaudron 


Reviewed-by: Xiao Zhang 


Applied to dpdk-next-net-intel, Thanks.

Re: [dpdk-dev] [PATCH v3 24/36] net/i40e/base: make i40e_set_mac_type() public

[Kwapulinski, Piotr]

ACK

-Original Message-
From: Ye, Xiaolong  
Sent: Monday, December 16, 2019 3:43 AM
To: Xing, Beilei ; Zhang, Qi Z 
Cc: dev@dpdk.org; Stillwell Jr, Paul M ; Ye, 
Xiaolong ; Kwapulinski, Piotr 

Subject: [PATCH v3 24/36] net/i40e/base: make i40e_set_mac_type() public

Make i40e_set_mac_type() public. i40e driver requires i40e_set_mac_type() to be 
public. It is required for recovery mode handling. Without this patch recovery 
mode could not be detected at probe() function.

Signed-off-by: Piotr Kwapulinski 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_common.c| 4 
 drivers/net/i40e/base/i40e_prototype.h | 2 --
 2 files changed, 6 deletions(-)

diff --git a/drivers/net/i40e/base/i40e_common.c 
b/drivers/net/i40e/base/i40e_common.c
index eddc91e36..4f87ec9fa 100644
--- a/drivers/net/i40e/base/i40e_common.c
+++ b/drivers/net/i40e/base/i40e_common.c
@@ -14,11 +14,7 @@
  * This function sets the mac type of the adapter based on the
  * vendor ID and device ID stored in the hw structure.
  **/
-#if defined(INTEGRATED_VF) || defined(VF_DRIVER)  enum i40e_status_code 
i40e_set_mac_type(struct i40e_hw *hw) -#else -STATIC enum i40e_status_code 
i40e_set_mac_type(struct i40e_hw *hw) -#endif  {
enum i40e_status_code status = I40E_SUCCESS;
 
diff --git a/drivers/net/i40e/base/i40e_prototype.h 
b/drivers/net/i40e/base/i40e_prototype.h
index afebf441d..2b6198985 100644
--- a/drivers/net/i40e/base/i40e_prototype.h
+++ b/drivers/net/i40e/base/i40e_prototype.h
@@ -472,10 +472,8 @@ void i40e_set_pci_config_data(struct i40e_hw *hw, u16 
link_status);  #endif /* PF_DRIVER */  enum i40e_status_code 
i40e_enable_eee(struct i40e_hw *hw, bool enable);
 
-#if defined(I40E_QV) || defined(VF_DRIVER)  enum i40e_status_code 
i40e_set_mac_type(struct i40e_hw *hw);
 
-#endif
 extern struct i40e_rx_ptype_decoded i40e_ptype_lookup[];
 
 STATIC INLINE struct i40e_rx_ptype_decoded decode_rx_desc_ptype(u8 ptype)
--
2.17.1



Intel Technology Poland sp. z o.o.
ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial 
Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | 
Kapital zakladowy 200.000 PLN.

Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i 
moze zawierac informacje poufne. W razie przypadkowego otrzymania tej 
wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; 
jakiekolwiek
przegladanie lub rozpowszechnianie jest zabronione.
This e-mail and any attachments may contain confidential material for the sole 
use of the intended recipient(s). If you are not the intended recipient, please 
contact the sender and delete all copies; any review or distribution by
others is strictly prohibited.

Re: [dpdk-dev] [PATCH v3 33/36] net/i40e/base: introduce firmware EMP reset register offsets

[Kwapulinski, Piotr]

ACK

-Original Message-
From: Ye, Xiaolong  
Sent: Monday, December 16, 2019 3:44 AM
To: Xing, Beilei ; Zhang, Qi Z 
Cc: dev@dpdk.org; Stillwell Jr, Paul M ; Ye, 
Xiaolong ; Kwapulinski, Piotr 

Subject: [PATCH v3 33/36] net/i40e/base: introduce firmware EMP reset register 
offsets

Introduce offsets of firmware registers holding a number of EMP resets.
Implement offsets as a preprocessor's constants.
Required by drivers to read a number of EMP resets reported by FW.

Signed-off-by: Piotr Kwapulinski 
Signed-off-by: Xiaolong Ye 
---
 drivers/net/i40e/base/i40e_register.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/i40e/base/i40e_register.h 
b/drivers/net/i40e/base/i40e_register.h
index 3a8c0ccd1..436f48efa 100644
--- a/drivers/net/i40e/base/i40e_register.h
+++ b/drivers/net/i40e/base/i40e_register.h
@@ -366,6 +366,8 @@
 #define I40E_GL_FWSTS_FWRI_MASK   I40E_MASK(0x1, I40E_GL_FWSTS_FWRI_SHIFT)
 #define I40E_GL_FWSTS_FWS1B_SHIFT 16
 #define I40E_GL_FWSTS_FWS1B_MASK  I40E_MASK(0xFF, I40E_GL_FWSTS_FWS1B_SHIFT)
+#define I40E_GL_FWSTS_FWS1B_EMPR_0 I40E_MASK(0x20, 
+I40E_GL_FWSTS_FWS1B_SHIFT) #define I40E_GL_FWSTS_FWS1B_EMPR_10 
+I40E_MASK(0x2A, I40E_GL_FWSTS_FWS1B_SHIFT)
 #define I40E_XL710_GL_FWSTS_FWS1B_REC_MOD_CORER_MASK \
I40E_MASK(0x30, I40E_GL_FWSTS_FWS1B_SHIFT)  
#define I40E_XL710_GL_FWSTS_FWS1B_REC_MOD_GLOBR_MASK \
--
2.17.1



Intel Technology Poland sp. z o.o.
ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial 
Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | 
Kapital zakladowy 200.000 PLN.

Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i 
moze zawierac informacje poufne. W razie przypadkowego otrzymania tej 
wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; 
jakiekolwiek
przegladanie lub rozpowszechnianie jest zabronione.
This e-mail and any attachments may contain confidential material for the sole 
use of the intended recipient(s). If you are not the intended recipient, please 
contact the sender and delete all copies; any review or distribution by
others is strictly prohibited.

Re: [dpdk-dev] [PATCH v2] net/virtio: packed ring notification data feature support

[Gavin Hu]

Hi Jiang,

> -Original Message-
> From: dev  On Behalf Of Cheng Jiang
> Sent: Wednesday, December 18, 2019 4:17 PM
> To: maxime.coque...@redhat.com; tiwei@intel.com;
> zhihong.w...@intel.com; yong@intel.com
> Cc: dev@dpdk.org; Cheng Jiang 
> Subject: [dpdk-dev] [PATCH v2] net/virtio: packed ring notification data
> feature support
> 
> This patch supports the feature that the driver passes extra data
> (besides identifying the virtqueue) in its device notifications.
Can the commit log be more specific about the extra data? Something like 
"expand the notification to include the avail index and avail wrap counter, if 
any"? 
> 
> Signed-off-by: Cheng Jiang 
> ---
> 
> v2:
> * Removed rte_unused attribute in *hw.
> * Added some comments on notify_data.
> 
>  drivers/net/virtio/virtio_ethdev.h |  3 ++-
>  drivers/net/virtio/virtio_pci.c| 27 +--
>  drivers/net/virtio/virtio_pci.h|  6 ++
>  3 files changed, 33 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/virtio/virtio_ethdev.h
> b/drivers/net/virtio/virtio_ethdev.h
> index a10111758..cd8947656 100644
> --- a/drivers/net/virtio/virtio_ethdev.h
> +++ b/drivers/net/virtio/virtio_ethdev.h
> @@ -36,7 +36,8 @@
>1ULL << VIRTIO_F_IN_ORDER| \
>1ULL << VIRTIO_F_RING_PACKED | \
>1ULL << VIRTIO_F_IOMMU_PLATFORM  | \
> -  1ULL << VIRTIO_F_ORDER_PLATFORM)
> +  1ULL << VIRTIO_F_ORDER_PLATFORM  | \
> +  1ULL << VIRTIO_F_NOTIFICATION_DATA)
> 
>  #define VIRTIO_PMD_SUPPORTED_GUEST_FEATURES  \
>   (VIRTIO_PMD_DEFAULT_GUEST_FEATURES |\
> diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
> index 4468e89cb..8b4e001a1 100644
> --- a/drivers/net/virtio/virtio_pci.c
> +++ b/drivers/net/virtio/virtio_pci.c
> @@ -416,9 +416,32 @@ modern_del_queue(struct virtio_hw *hw, struct
> virtqueue *vq)
>  }
> 
>  static void
> -modern_notify_queue(struct virtio_hw *hw __rte_unused, struct virtqueue
> *vq)
> +modern_notify_queue(struct virtio_hw *hw, struct virtqueue *vq)
>  {
> - rte_write16(vq->vq_queue_index, vq->notify_addr);
> + uint32_t notify_data;
> +
> + if (!vtpci_with_feature(hw, VIRTIO_F_NOTIFICATION_DATA)) {
> + rte_write16(vq->vq_queue_index, vq->notify_addr);
> + return;
> + }
> +
> + if (vtpci_with_feature(hw, VIRTIO_F_RING_PACKED)) {
> + /*
> +  * Bit[0:15]: vq queue index
> +  * Bit[16:30]: avail index
> +  * Bit[31]: avail wrap counter
> +  */
> + notify_data = uint32_t)vq-
> >vq_packed.used_wrap_counter << 15) |
Why not do ' used_wrap_counter << 31' to be more straightforward and matches 
the above comment?  
> + vq->vq_avail_idx) << 16) | vq-
> >vq_queue_index;

> + } else {
> + /*
> +  * Bit[0:15]: vq queue index
> +  * Bit[16:31]: avail index
> +  */
> + notify_data = ((uint32_t)vq->vq_avail_idx << 16) |
> + vq->vq_queue_index;
> + }
> + rte_write32(notify_data, vq->notify_addr);
>  }
> 
>  const struct virtio_pci_ops modern_ops = {
> diff --git a/drivers/net/virtio/virtio_pci.h b/drivers/net/virtio/virtio_pci.h
> index a38cb45ad..7433d2f08 100644
> --- a/drivers/net/virtio/virtio_pci.h
> +++ b/drivers/net/virtio/virtio_pci.h
> @@ -135,6 +135,12 @@ struct virtnet_ctl;
>   */
>  #define VIRTIO_F_ORDER_PLATFORM 36
> 
> +/*
> + * This feature indicates that the driver passes extra data (besides
> + * identifying the virtqueue) in its device notifications.
> + */
> +#define VIRTIO_F_NOTIFICATION_DATA 38
> +
>  /* The Guest publishes the used index for which it expects an interrupt
>   * at the end of the avail ring. Host should ignore the avail->flags field. 
> */
>  /* The Host publishes the avail index for which it expects a kick
> --
> 2.17.1

[dpdk-dev] [PATCH 1/2] net/mlx5: fix setting of Rx hash fields

[Dekel Peled]

Rx hash fields were copied from input parameter into TIR attributes
directly, with no translation. As result the copied value was wrong.

This patch adds translation of value from input bitmap to the
appropriate format.

Fixes: dc9ceff73c99 ("net/mlx5: create advanced RxQ via DevX")
Cc: sta...@dpdk.org

Signed-off-by: Dekel Peled 
Acked-by: Matan Azrad 
---
 drivers/net/mlx5/mlx5_flow.h | 21 +
 drivers/net/mlx5/mlx5_rxq.c  | 29 +++--
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index 3fff5dd..db12715 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -288,6 +288,27 @@ enum mlx5_feature_name {
 /* IBV hash source bits  for IPV6. */
 #define MLX5_IPV6_IBV_RX_HASH (IBV_RX_HASH_SRC_IPV6 | IBV_RX_HASH_DST_IPV6)
 
+/* IBV hash bits for L3 SRC. */
+#define MLX5_L3_SRC_IBV_RX_HASH (IBV_RX_HASH_SRC_IPV4 | IBV_RX_HASH_SRC_IPV6)
+
+/* IBV hash bits for L3 DST. */
+#define MLX5_L3_DST_IBV_RX_HASH (IBV_RX_HASH_DST_IPV4 | IBV_RX_HASH_DST_IPV6)
+
+/* IBV hash bits for TCP. */
+#define MLX5_TCP_IBV_RX_HASH (IBV_RX_HASH_SRC_PORT_TCP | \
+ IBV_RX_HASH_DST_PORT_TCP)
+
+/* IBV hash bits for UDP. */
+#define MLX5_UDP_IBV_RX_HASH (IBV_RX_HASH_SRC_PORT_UDP | \
+ IBV_RX_HASH_DST_PORT_UDP)
+
+/* IBV hash bits for L4 SRC. */
+#define MLX5_L4_SRC_IBV_RX_HASH (IBV_RX_HASH_SRC_PORT_TCP | \
+IBV_RX_HASH_SRC_PORT_UDP)
+
+/* IBV hash bits for L4 DST. */
+#define MLX5_L4_DST_IBV_RX_HASH (IBV_RX_HASH_DST_PORT_TCP | \
+IBV_RX_HASH_DST_PORT_UDP)
 
 /* Geneve header first 16Bit */
 #define MLX5_GENEVE_VER_MASK 0x3
diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 986ec01..906ff0e 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -36,6 +36,7 @@
 #include "mlx5_autoconf.h"
 #include "mlx5_defs.h"
 #include "mlx5_glue.h"
+#include "mlx5_flow.h"
 
 /* Default RSS hash key also used for ConnectX-3. */
 uint8_t rss_hash_default_key[] = {
@@ -2452,6 +2453,7 @@ struct mlx5_hrxq *
}
} else { /* ind_tbl->type == MLX5_IND_TBL_TYPE_DEVX */
struct mlx5_devx_tir_attr tir_attr;
+   struct mlx5_rx_hash_field_select *rx_hash_field_select;
uint32_t i;
uint32_t lro = 1;
 
@@ -2465,8 +2467,31 @@ struct mlx5_hrxq *
memset(&tir_attr, 0, sizeof(tir_attr));
tir_attr.disp_type = MLX5_TIRC_DISP_TYPE_INDIRECT;
tir_attr.rx_hash_fn = MLX5_RX_HASH_FN_TOEPLITZ;
-   memcpy(&tir_attr.rx_hash_field_selector_outer, &hash_fields,
-  sizeof(uint64_t));
+#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
+   tir_attr.tunneled_offload_en = !!tunnel;
+   /* Translate hash_fields bitmap to PRM format. */
+   rx_hash_field_select = hash_fields & IBV_RX_HASH_INNER ?
+  &tir_attr.rx_hash_field_selector_inner :
+  &tir_attr.rx_hash_field_selector_outer;
+#else
+   rx_hash_field_select = &tir_attr.rx_hash_field_selector_outer;
+#endif
+   /* 1 bit: 0: IPv4, 1: IPv6. */
+   rx_hash_field_select->l3_prot_type =
+   !!(hash_fields & MLX5_IPV6_IBV_RX_HASH);
+   /* 1 bit: 0: TCP, 1: UDP. */
+   rx_hash_field_select->l4_prot_type =
+   !!(hash_fields & MLX5_UDP_IBV_RX_HASH);
+   /* Bitmask which sets which fields to use in RX Hash. */
+   rx_hash_field_select->selected_fields =
+   ((!!(hash_fields & MLX5_L3_SRC_IBV_RX_HASH)) <<
+MLX5_RX_HASH_FIELD_SELECT_SELECTED_FIELDS_SRC_IP) |
+   (!!(hash_fields & MLX5_L3_DST_IBV_RX_HASH)) <<
+MLX5_RX_HASH_FIELD_SELECT_SELECTED_FIELDS_DST_IP |
+   (!!(hash_fields & MLX5_L4_SRC_IBV_RX_HASH)) <<
+MLX5_RX_HASH_FIELD_SELECT_SELECTED_FIELDS_L4_SPORT |
+   (!!(hash_fields & MLX5_L4_DST_IBV_RX_HASH)) <<
+MLX5_RX_HASH_FIELD_SELECT_SELECTED_FIELDS_L4_DPORT;
if (rxq_ctrl->obj->type == MLX5_RXQ_OBJ_TYPE_DEVX_HAIRPIN)
tir_attr.transport_domain = priv->sh->td->id;
else
-- 
1.8.3.1

[dpdk-dev] [PATCH 2/2] net/mlx5: support RSS on SRC or DST fields only

[Dekel Peled]

This patch implements the feature described in RFC [1], adding
support of RSS action on L3 and/or L4 source or destination only.

[1] http://mails.dpdk.org/archives/dev/2019-December/152796.html

Signed-off-by: Dekel Peled 
Acked-by: Matan Azrad 
---
 doc/guides/nics/mlx5.rst   |  2 +
 doc/guides/rel_notes/release_20_02.rst |  6 +++
 drivers/net/mlx5/mlx5_defs.h   |  7 ++-
 drivers/net/mlx5/mlx5_flow.c   | 12 +
 drivers/net/mlx5/mlx5_flow_dv.c| 91 ++
 5 files changed, 97 insertions(+), 21 deletions(-)

diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index 18573cf..92228d3 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -64,6 +64,8 @@ Features
 - Multiple TX and RX queues.
 - Support for scattered TX and RX frames.
 - IPv4, IPv6, TCPv4, TCPv6, UDPv4 and UDPv6 RSS on any number of queues.
+- RSS using different combinations of fields: L3 only, L4 only or both,
+  and source only, destination only or both.
 - Several RSS hash keys, one for each flow type.
 - Default RSS operation with no hash key specification.
 - Configurable RETA table.
diff --git a/doc/guides/rel_notes/release_20_02.rst 
b/doc/guides/rel_notes/release_20_02.rst
index 0eaa45a..8cd3470 100644
--- a/doc/guides/rel_notes/release_20_02.rst
+++ b/doc/guides/rel_notes/release_20_02.rst
@@ -56,6 +56,12 @@ New Features
  Also, make sure to start the actual text at the margin.
  =
 
+* **Updated Mellanox mlx5 driver.**
+
+  Updated Mellanox mlx5 driver with new features and improvements, including:
+
+  * Added support for RSS using L3/L4 source/destination only.
+
 
 Removed Items
 -
diff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h
index 042e1f3..dc9b965 100644
--- a/drivers/net/mlx5/mlx5_defs.h
+++ b/drivers/net/mlx5/mlx5_defs.h
@@ -104,8 +104,13 @@
 /* Number of packets vectorized Rx can simultaneously process in a loop. */
 #define MLX5_VPMD_DESCS_PER_LOOP  4
 
+/* Mask of RSS on source only or destination only. */
+#define MLX5_RSS_SRC_DST_ONLY (ETH_RSS_L3_SRC_ONLY | ETH_RSS_L3_DST_ONLY | \
+  ETH_RSS_L4_SRC_ONLY | ETH_RSS_L4_DST_ONLY)
+
 /* Supported RSS */
-#define MLX5_RSS_HF_MASK (~(ETH_RSS_IP | ETH_RSS_UDP | ETH_RSS_TCP))
+#define MLX5_RSS_HF_MASK (~(ETH_RSS_IP | ETH_RSS_UDP | ETH_RSS_TCP | \
+   MLX5_RSS_SRC_DST_ONLY))
 
 /* Timeout in seconds to get a valid link status. */
 #define MLX5_LINK_STATUS_TIMEOUT 10
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 0087163..cb9d265 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -1150,6 +1150,18 @@ uint32_t mlx5_flow_adjust_priority(struct rte_eth_dev 
*dev, int32_t priority,
  &rss->types,
  "some RSS protocols are not"
  " supported");
+   if ((rss->types & (ETH_RSS_L3_SRC_ONLY | ETH_RSS_L3_DST_ONLY)) &&
+   !(rss->types & ETH_RSS_IP))
+   return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL,
+ "L3 partial RSS requested but L3 RSS"
+ " type not specified");
+   if ((rss->types & (ETH_RSS_L4_SRC_ONLY | ETH_RSS_L4_DST_ONLY)) &&
+   !(rss->types & (ETH_RSS_UDP | ETH_RSS_TCP)))
+   return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, NULL,
+ "L4 partial RSS requested but L4 RSS"
+ " type not specified");
if (!priv->rxqs_n)
return rte_flow_error_set(error, EINVAL,
  RTE_FLOW_ERROR_TYPE_ACTION_CONF,
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 73aaea4..12cbf17 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -6577,6 +6577,75 @@ struct field_modify_info modify_tcp[] = {
 }
 
 /**
+ * Set the hash fields according to the @p flow information.
+ *
+ * @param[in] dev_flow
+ *   Pointer to the mlx5_flow.
+ */
+static void
+flow_dv_hashfields_set(struct mlx5_flow *dev_flow)
+{
+   struct rte_flow *flow = dev_flow->flow;
+   uint64_t items = dev_flow->layers;
+   int rss_inner = 0;
+   uint64_t rss_types = rte_eth_rss_hf_refine(flow->rss.types);
+
+   dev_flow->hash_fields = 0;
+#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
+   if (flow->rss.level >= 2) {
+   dev_flow->hash_fields |= IBV_RX_HASH_INNER;
+   rss_inner = 1;
+   }
+#endif
+   if ((rss_inner && (items & MLX5_FLOW_LAYER_INNER_L3_IPV4)) ||
+   (!rss_inner && (items & MLX5_FLOW_LA

[dpdk-dev] [PATCH 0/2] net/mlx5: update RSS action handling

[Dekel Peled]

This series includes 2 patches updating the RSS action handling.
The first patch fixes an error in existing code.
The second patch implements additional functionality.

Dekel Peled (2):
  net/mlx5: fix setting of Rx hash fields
  net/mlx5: support RSS on SRC or DST fields only

 doc/guides/nics/mlx5.rst   |  2 +
 doc/guides/rel_notes/release_20_02.rst |  6 +++
 drivers/net/mlx5/mlx5_defs.h   |  7 ++-
 drivers/net/mlx5/mlx5_flow.c   | 12 +
 drivers/net/mlx5/mlx5_flow.h   | 21 
 drivers/net/mlx5/mlx5_flow_dv.c| 91 ++
 drivers/net/mlx5/mlx5_rxq.c| 29 ++-
 7 files changed, 145 insertions(+), 23 deletions(-)

-- 
1.8.3.1

Re: [dpdk-dev] [PATCH v3] net/ixgbe: fix port can not link up in FreeBSD

[Ananyev, Konstantin]

> In FreeBSD environment, nic_uio drivers do not support interrupts,
> rte_intr_callback_register() will fail to register interrupts.
> We can not make link status to change from down to up by interrupt
> callback. So we need to wait for the controller to acquire link
> when ports start. Through multiple tests, 5s should be enough.
> 
> Fixes: b9bd0f09fa15 ("ethdev: fix link status query")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Lunyuan Cui 
> ---
> 
> v3 changes:
> * Hide ifdef inside the function
> 
> v2 changes:
> * Put waiting into a separate function to keep start() code clean.
> ---
>  drivers/net/ixgbe/ixgbe_ethdev.c | 36 
>  1 file changed, 36 insertions(+)
> 
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c 
> b/drivers/net/ixgbe/ixgbe_ethdev.c
> index 2c6fd0f13..d9b0c5b02 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.c
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
> @@ -378,6 +378,7 @@ static int ixgbe_dev_udp_tunnel_port_del(struct 
> rte_eth_dev *dev,
>struct rte_eth_udp_tunnel *udp_tunnel);
>  static int ixgbe_filter_restore(struct rte_eth_dev *dev);
>  static void ixgbe_l2_tunnel_conf(struct rte_eth_dev *dev);
> +static int ixgbe_wait_for_link_up(struct ixgbe_hw *hw);
> 
>  /*
>   * Define VF Stats MACRO for Non "cleared on read" register
> @@ -2801,6 +2802,11 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
>   "please call hierarchy_commit() "
>   "before starting the port");
> 
> + /* wait for the controller to acquire link */
> + err = ixgbe_wait_for_link_up(hw);
> + if (err)
> + goto error;
> +
>   /*
>* Update link status right before return, because it may
>* start link configuration process in a separate thread.
> @@ -4114,6 +4120,36 @@ ixgbe_dev_setup_link_alarm_handler(void *param)
>   intr->flags &= ~IXGBE_FLAG_NEED_LINK_CONFIG;
>  }
> 
> +/*
> + * In freebsd environment, nic_uio drivers do not support interrupts,
> + * rte_intr_callback_register() will fail to register interrupts.
> + * We can not make link status to change from down to up by interrupt
> + * callback. So we need to wait for the controller to acquire link
> + * when ports start.
> + * It returns 0 on link up.
> + */
> +static int
> +ixgbe_wait_for_link_up(struct ixgbe_hw *hw)
> +{
> +#ifdef RTE_EXEC_ENV_FREEBSD
> + const int nb_iter = 25;
> +#else
> + const int nb_iter = 0;
> +#endif
> + int err, i, link_up = 0;
> + uint32_t speed = 0;
> +
> + for (i = 0; i < nb_iter; i++) {
> + err = ixgbe_check_link(hw, &speed, &link_up, 0);
> + if (err)
> + return err;
> + if (link_up)
> + return 0;
> + msec_delay(200);
> + }
> + return 0;
> +}
> +
>  /* return 0 means link status changed, -1 means not changed */
>  int
>  ixgbe_dev_link_update_share(struct rte_eth_dev *dev,
> --

Acked-by: Konstantin Ananyev 

> 2.17.1

[dpdk-dev] 18.11.6 (LTS) patches review and test

[Kevin Traynor]

Hi all,

Here is a list of patches targeted for LTS release 18.11.6.

The planned date for the final release is 31st January.

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

A release candidate tarball can be found at:

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

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

Thanks.

Kevin.

---
Aaron Conole (1):
  test/interrupt: account for race with callback

Abhishek Sachan (1):
  net/af_packet: fix stale sockets

Adrian Moreno (4):
  vhost: fix vring memory partially mapped
  vhost: translate incoming log address to GPA
  vhost: prevent zero copy mode if IOMMU is on
  vhost: convert buffer addresses to GPA for logging

Ajit Khaparde (9):
  net/bnxt: fix setting max RSS contexts
  net/bnxt: fix writing MTU to FW
  net/bnxt: fix crash in xstats get
  net/bnxt: fix resource qcaps with older FW
  net/bnxt: fix async link handling and update
  net/bnxt: fix flow flush handling
  net/bnxt: update trusted VF status only when it changes
  net/bnxt: fix doorbell register offset for Tx ring
  net/bnxt: get default HWRM command timeout from FW

Akhil Goyal (1):
  crypto/dpaa2_sec: fix length retrieved from hardware

Ali Alnubani (2):
  mk: fix build on arm64
  eal: fix header file install with meson

Alvin Zhang (1):
  net/i40e: fix exception with multi-driver

Amaranath Somalapuram (5):
  doc: fix l2fwd-crypto usage in CCP guide
  crypto/ccp: fix maximum queues and burst size
  crypto/ccp: fix CPU authentication crash
  crypto/ccp: fix scheduling of burst
  crypto/ccp: fix digest size capabilities

Anatoly Burakov (2):
  mempool: use actual IOVA addresses when populating
  common/octeontx: add missing public symbol

Andrew Rybchenko (5):
  ethdev: fix doc reference to FDIR disabled mode
  ethdev: remove redundant device info cleanup before get
  net/sfc: fix missing notification on link status change
  net/virtio: reject unsupported Tx multi-queue modes
  ethdev: avoid undefined behaviour on configuration copy

Andrzej Ostruszka (4):
  doc: fix description of versioning macros
  eventdev: fix possible use of uninitialized var
  doc: fix tap guide
  net/dpaa2: fix possible use of uninitialized vars

Anoob Joseph (1):
  examples/ipsec-secgw: fix access to freed packet

Archana Muniganti (1):
  app/crypto-perf: fix input of AEAD decrypt

Arek Kusztal (1):
  crypto/qat: fix AES CMAC mininum digest size

Bernard Iremonger (1):
  examples/ipsec-secgw: fix unchecked return value

Bruce Richardson (4):
  examples/vm_power: fix type of cmdline token in cli
  port: fix pcap support with meson
  examples: hide error for missing pkg-config path flag
  usertools: fix typo in SPDX tag of telemetry script

Chaitanya Babu Talluri (1):
  examples/fips_validation: fix null dereferences

Christian Ehrhardt (2):
  net/mlx4: fix build on ppc64
  build: avoid overlinking

Ciara Power (3):
  app/testpmd: fix help for loop topology option
  ethdev: fix include of ethernet header file
  app/procinfo: use strlcpy for copying string

Congwen Zhang (2):
  net/ixgbe: fix zeroing of RSS config
  net/e1000: fix zeroing of RSS config

Damian Nowak (1):
  crypto/qat: fix null auth when using VFIO

David Christensen (3):
  eal/ppc: fix 64-bit atomic exchange operation
  eal/linux: restore specific hugepage ordering for ppc
  vhost: fix build on RHEL 7.6 for Power

David Hunt (2):
  examples/vm_power: fix build without i40e
  examples/vm_power: fix OOB frequency oscillations

David Marchand (15):
  net/bonding: fix out of bound access in LACP mode
  net/bonding: fix LACP fast queue Rx handler
  net/bonding: fix unicast packets filtering
  ci: add missing dependencies for documentation
  net/qede: limit Rx ring index read for debug
  devtools: fix cleanup of checkpatch temporary file
  eal: remove dead code on NUMA node detection
  net/mlx4: remove dependency on libmnl in meson
  net/bonding: use non deprecated PCI API
  doc: fix internal links for older releases
  doc: fix link to AESNI mb external library
  doc/guides: clean repeated words
  build: remove unneeded meson option
  app/testpmd: report invalid command line parameter
  buildtools: fix build with coverage

Dekel Peled (2):
  doc: fix description of links to EAL options pages
  net/mlx5: fix check of RSS queue index

Dilshod Urazov (3):
  net/virtio: reject deferred Rx start
  net/virtio: reject deferred Tx start
  net/virtio: reject unsupported Rx multi-queue modes

Eelco Chaudron (1):
  net/i40e: downgrade 

[dpdk-dev] [PATCH v4] app/test: fix build when ring PMD is disabled

[Reshma Pattan]

Some unit tests has dependency on RING PMD,
so this patch is trying to fix those and other
closely related issues.

1)pdump, latency, bitrate, ring PMD and test_event_eth_tx_adapter
unit tests are dependent on ring PMD, so compile those
tests only when ring PMD is enabled else ignore.

2)get rid of make file error which was added by bond unit test
for ring PMD disabled case which is not necessary.

3)Tx adapter UT is dependent on RING PMD, but it was
observed that it was missing from the run in meson
build, so added it. TX adapter UT uses 'sw event and
'null' pmd drivers, so for shared builds the drivers .so
path has to be passed to the test args of meson UT run.

Fixes: 086eb64db3 ("test/pdump: add unit test for pdump library")
Fixes: fdeb30fa71 ("test/bitrate: add unit tests for bitrate library")
Fixes: 1e3676a06e ("test/latency: add unit tests for latencystats library")
Fixes: 46cf97e4bb ("eventdev: add test for eth Tx adapter")
Fixes: d23e09e0ef ("app/test: link with ring pmd when needed")

CC: sta...@dpdk.org
CC: Nikhil Rao 
CC: Chas Williams 
CC: Bruce Richardson 
CC: Stephen Hemminger 

Reported-by: Stephen Hemminger 
Signed-off-by: Reshma Pattan 
---
v4: fix event_eth_tx_adapter_autotest for shared build
as reported by travis-ci
https://travis-ci.com/ovsrobot/dpdk/jobs/249598391
v3: add missing test event_eth_tx_adapter_autotest.
Add link bonding mode4 test to drivers test.
v2: fix comments of v1 and combine the patches 1/2 and 2/2 of v1
---
 app/test/Makefile| 16 +---
 app/test/meson.build | 37 +++--
 app/test/process.h   |  8 
 app/test/test.c  |  2 ++
 4 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/app/test/Makefile b/app/test/Makefile
index 57930c00b..1ee155009 100644
--- a/app/test/Makefile
+++ b/app/test/Makefile
@@ -151,8 +151,12 @@ SRCS-y += test_func_reentrancy.c
 
 SRCS-y += test_service_cores.c
 
+ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)
+SRCS-y += sample_packet_forward.c
 SRCS-$(CONFIG_RTE_LIBRTE_BITRATE) += test_bitratestats.c
 SRCS-$(CONFIG_RTE_LIBRTE_LATENCY_STATS) += test_latencystats.c
+SRCS-$(CONFIG_RTE_LIBRTE_PDUMP) += test_pdump.c
+endif
 
 SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline.c
 SRCS-$(CONFIG_RTE_LIBRTE_CMDLINE) += test_cmdline_num.c
@@ -181,11 +185,8 @@ SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += 
test_distributor_perf.c
 
 SRCS-$(CONFIG_RTE_LIBRTE_REORDER) += test_reorder.c
 
-SRCS-$(CONFIG_RTE_LIBRTE_PDUMP) += test_pdump.c
-
 SRCS-y += virtual_pmd.c
 SRCS-y += packet_burst_generator.c
-SRCS-y += sample_packet_forward.c
 SRCS-$(CONFIG_RTE_LIBRTE_ACL) += test_acl.c
 
 ifeq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)
@@ -215,7 +216,7 @@ ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y)
 SRCS-y += test_eventdev.c
 SRCS-y += test_event_ring.c
 SRCS-y += test_event_eth_rx_adapter.c
-SRCS-y += test_event_eth_tx_adapter.c
+SRCS-$(CONFIG_RTE_LIBRTE_PMD_RING) += test_event_eth_tx_adapter.c
 SRCS-y += test_event_timer_adapter.c
 SRCS-y += test_event_crypto_adapter.c
 endif
@@ -268,13 +269,6 @@ endif
 endif
 endif
 
-# Link against shared libraries when needed
-ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y)
-ifneq ($(CONFIG_RTE_LIBRTE_PMD_RING),y)
-$(error Link bonding tests require CONFIG_RTE_LIBRTE_PMD_RING=y)
-endif
-endif
-
 ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y)
 
 ifeq ($(CONFIG_RTE_LIBRTE_PMD_BOND),y)
diff --git a/app/test/meson.build b/app/test/meson.build
index fb49d804b..b3790b4bc 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -7,13 +7,11 @@ endif
 
 test_sources = files('commands.c',
'packet_burst_generator.c',
-   'sample_packet_forward.c',
'test.c',
'test_acl.c',
'test_alarm.c',
'test_atomic.c',
'test_barrier.c',
-   'test_bitratestats.c',
'test_bpf.c',
'test_byteorder.c',
'test_cmdline.c',
@@ -43,7 +41,6 @@ test_sources = files('commands.c',
'test_event_crypto_adapter.c',
'test_event_eth_rx_adapter.c',
'test_event_ring.c',
-   'test_event_eth_tx_adapter.c',
'test_event_timer_adapter.c',
'test_eventdev.c',
'test_external_mem.c',
@@ -65,9 +62,7 @@ test_sources = files('commands.c',
'test_ipsec_sad.c',
'test_kni.c',
'test_kvargs.c',
-   'test_latencystats.c',
'test_link_bonding.c',
-   'test_link_bonding_mode4.c',
'test_link_bonding_rssconf.c',
'test_logs.c',
'test_lpm.c',
@@ -88,11 +83,8 @@ test_sources = files('commands.c',
'test_metrics.c',
'test_mcslock.c',
'test_mp_secondary.c',
-   'test_pdump.c',
'test_per_lcore.c',
'test_pmd_perf.c',
-   'test_pmd_ring.c',
-   'test_pmd_ring_perf.c',
'test_power.c',
'test_power_cpufreq.c',
'test_power_kvm_vm.c',
@@ -212,7 +204,6 @@ fast_test_names = [
 'rib_autotest',
 'rib6_autotest',
 'ring_autotest',
-'ring_pmd_autotest',
 'rwlock_test1_autotest',

Re: [dpdk-dev] [PATCH 2/2] devtools: add path to additional shared object files

[Laatz, Kevin]

On 18/12/2019 08:23, David Marchand wrote:

On Wed, Dec 18, 2019 at 6:39 AM Ruifeng Wang  wrote:

librte_mempool_ring.so and librte_pmd_null.so are in 'drivers' folder.
Add 'drivers' into LD_LIBRARY_PATH so that testpmd can find and make
use of these shared libraries.

Signed-off-by: Ruifeng Wang 
Reviewed-by: Gavin Hu 
---
  devtools/test-null.sh | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devtools/test-null.sh b/devtools/test-null.sh
index f39af2c06..548de8113 100755
--- a/devtools/test-null.sh
+++ b/devtools/test-null.sh
@@ -20,7 +20,7 @@ if [ ! -f "$testpmd" ] ; then
  fi

  if ldd $testpmd | grep -q librte_ ; then
-   export LD_LIBRARY_PATH=$build/lib:$LD_LIBRARY_PATH
+   export LD_LIBRARY_PATH=$build/drivers:$build/lib:$LD_LIBRARY_PATH
 libs='-d librte_mempool_ring.so -d librte_pmd_null.so'
  else
 libs=
--
2.17.1


I'm surprised to see this.
So far, the CI ran fine without it, so something is different in the
environment.

I can see that the RPATH entry disappeared from the testpmd binary.
Xenial:
# readelf -d build/app/dpdk-testpmd |grep RPATH
  0x000f (RPATH)  Library rpath:
[$ORIGIN/../lib:$ORIGIN/../drivers:X]

(not sure what  purpose is, but different topic)

Bionic:
# readelf -d build/app/dpdk-testpmd |grep RPATH


It looks like RPATH just changed to be named RUNPATH in Bionic:

# readelf -d build/app/dpdk-testpmd | grep R.*PATH
 0x001d (RUNPATH)    Library runpath: 
[$ORIGIN/../lib:$ORIGIN/../drivers:X]



Adding Bruce and Kevin, as I think this is the same issue than:
http://mails.dpdk.org/archives/dev/2019-December/153627.html
Could it be a change in meson?


Yes, looks like the same error to me.

I'm not sure this is solely a meson issue, I often need to pass -d 
librte_mempool_ring.so when using make builds too. Maybe I'm missing 
something here?


---
Kevin

Re: [dpdk-dev] [EXT] Re: [PATCH] ethdev: allow multiple security sessions to use one rte flow

[Medvedkin, Vladimir]

Hi Anoob,

On 18/12/2019 03:54, Anoob Joseph wrote:

Hi Vladimir,

Please see inline.

Thanks,
Anoob


-Original Message-
From: Medvedkin, Vladimir 
Sent: Tuesday, December 17, 2019 11:14 PM
To: Anoob Joseph ; Ananyev, Konstantin
; Akhil Goyal ;
Adrien Mazarguil ; Doherty, Declan
; Yigit, Ferruh ; Jerin
Jacob Kollanukkaran ; Thomas Monjalon

Cc: Ankur Dwivedi ; Hemant Agrawal
; Matan Azrad ;
Nicolau, Radu ; Shahaf Shuler
; Narayana Prasad Raju Athreya
; dev@dpdk.org
Subject: Re: [EXT] Re: [dpdk-dev] [PATCH] ethdev: allow multiple security
sessions to use one rte flow

Hi Anoob,

On 17/12/2019 14:24, Anoob Joseph wrote:

Hi Vladimir,

Please see inline.

Thanks,
Anoob


-Original Message-
From: Medvedkin, Vladimir 
Sent: Tuesday, December 17, 2019 4:51 PM
To: Anoob Joseph ; Ananyev, Konstantin
; Akhil Goyal ;
Adrien Mazarguil ; Doherty, Declan
; Yigit, Ferruh ;
Jerin Jacob Kollanukkaran ; Thomas Monjalon

Cc: Ankur Dwivedi ; Hemant Agrawal
; Matan Azrad ;

Nicolau,

Radu ; Shahaf Shuler

;

Narayana Prasad Raju Athreya ; dev@dpdk.org
Subject: Re: [EXT] Re: [dpdk-dev] [PATCH] ethdev: allow multiple
security sessions to use one rte flow

Hi Anoob,

On 16/12/2019 16:16, Anoob Joseph wrote:

Hi Vladimir,

Please see inline.

Thanks,
Anoob


-Original Message-
From: Medvedkin, Vladimir 
Sent: Monday, December 16, 2019 9:29 PM
To: Anoob Joseph ; Ananyev, Konstantin
; Akhil Goyal ;
Adrien Mazarguil ; Doherty, Declan
; Yigit, Ferruh ;
Jerin Jacob Kollanukkaran ; Thomas Monjalon

Cc: Ankur Dwivedi ; Hemant Agrawal
; Matan Azrad ;

Nicolau,

Radu ; Shahaf Shuler
; Narayana Prasad Raju Athreya
; dev@dpdk.org
Subject: [EXT] Re: [dpdk-dev] [PATCH] ethdev: allow multiple
security sessions to use one rte flow

External Email

---
--
-
Hi Anoob,

On 11/12/2019 17:33, Anoob Joseph wrote:

Hi Konstantin,

Please see inline.

Thanks,
Anoob


-Original Message-
From: dev  On Behalf Of Ananyev,

Konstantin

Sent: Wednesday, December 11, 2019 4:36 PM
To: Anoob Joseph ; Akhil Goyal
; Adrien Mazarguil
; Doherty, Declan
; Yigit, Ferruh
; Jerin Jacob Kollanukkaran
; Thomas Monjalon 
Cc: Ankur Dwivedi ; Hemant Agrawal
; Matan Azrad

;

Nicolau,

Radu ; Shahaf Shuler
; Narayana Prasad Raju Athreya
; dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH] ethdev: allow multiple security
sessions to use one rte flow



The rte_security API which enables inline protocol/crypto
feature mandates that for every security session an rte_flow is

created.

This would internally translate to a rule in the hardware
which would do packet classification.

In rte_securty, one SA would be one security session. And if
an rte_flow need to be created for every session, the number
of SAs supported by an inline implementation would be limited
by the number of rte_flows the PMD would be able to support.

If the fields SPI & IP addresses are allowed to be a range,
then this limitation can be overcome. Multiple flows will be
able to use one rule for SECURITY processing. In this case,
the security session provided as conf would be NULL.

Wonder what will be the usage model for it?
AFAIK,  RFC 4301 clearly states that either SPI value alone or
in conjunction with dst (and src) IP should clearly identify SA
for inbound SAD

lookup.

Am I missing something obvious here?

[Anoob] Existing SECURITY action type requires application to
create an 'rte_flow' per SA, which is not really required if h/w
can use SPI to uniquely

identify the security session/SA.

Existing rte_flow usage: IP (dst,src) + ESP + SPI -> security
processing enabled on one security session (ie on SA)

The above rule would uniquely identify packets for an SA. But
with the above usage, we would quickly exhaust entries available
in h/w lookup tables (which are limited on our hardware). But if
h/w can use SPI field to index

into a table (for example), then the above requirement of one
rte_flow per SA is not required.

Proposed rte_flow usage: IP (any) + ESP + SPI (any) -> security
processing enabled on all ESP packets

So this means that SA will be indexed only by spi? What about SA's
which are indexed by SPI+DIP+SIP?

Now h/w could use SPI to index into a pre-populated table to get
security session. Please do note that, SPI is not ignored during
the actual

lookup. Just that it is not used while creating 'rte_flow'.

And this table will be prepopulated by user and pointer to it
will be somehow passed via rte_flow API?
If yes, then what would be the mechanism?

[Anoob] I'm not sure what exactly you meant by user. But may be
I'll explain

how it's done in OCTEONTX2 PMD.

The application would create security_session for every SA. SPI
etc would be

available to PMD (in conf) when the session is created. Now the PMD
would populate SA related params in a specific location that h/w
would access. This memory is allocated during device configure and
h/w would have the pointer after the initialization is done.
If memory

[dpdk-dev] [PATCH] net/mlx5: fix item flag on GENEVE item validation

[Dekel Peled]

On validation of GENEVE item, the wrong flag is used.
This patch sets the correct bit in item_flags bitmap.

Fixes: e59a5dbcfd07 ("net/mlx5: add flow match on GENEVE item")
Cc: sta...@dpdk.org

Signed-off-by: Dekel Peled 
---
 drivers/net/mlx5/mlx5_flow_dv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 1a1b6ec..6f35fe1 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -4489,7 +4489,7 @@ struct field_modify_info modify_tcp[] = {
 error);
if (ret < 0)
return ret;
-   last_item = MLX5_FLOW_LAYER_VXLAN_GPE;
+   last_item = MLX5_FLOW_LAYER_GENEVE;
break;
case RTE_FLOW_ITEM_TYPE_MPLS:
ret = mlx5_flow_validate_item_mpls(dev, items,
-- 
1.8.3.1

Re: [dpdk-dev] [PATCH] net/mlx5: fix item flag on GENEVE item validation

[Matan Azrad]

From: Dekel Peled 
> On validation of GENEVE item, the wrong flag is used.
> This patch sets the correct bit in item_flags bitmap.
> 
> Fixes: e59a5dbcfd07 ("net/mlx5: add flow match on GENEVE item")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Dekel Peled 
Acked-by: Matan Azrad 

Re: [dpdk-dev] [PATCH 2/2] devtools: add path to additional shared object files

[David Marchand]

On Wed, Dec 18, 2019 at 2:43 PM Laatz, Kevin  wrote:
>
> On 18/12/2019 08:23, David Marchand wrote:
> > On Wed, Dec 18, 2019 at 6:39 AM Ruifeng Wang  wrote:
> >> librte_mempool_ring.so and librte_pmd_null.so are in 'drivers' folder.
> >> Add 'drivers' into LD_LIBRARY_PATH so that testpmd can find and make
> >> use of these shared libraries.
> >>
> >> Signed-off-by: Ruifeng Wang 
> >> Reviewed-by: Gavin Hu 
> >> ---
> >>   devtools/test-null.sh | 2 +-
> >>   1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >> diff --git a/devtools/test-null.sh b/devtools/test-null.sh
> >> index f39af2c06..548de8113 100755
> >> --- a/devtools/test-null.sh
> >> +++ b/devtools/test-null.sh
> >> @@ -20,7 +20,7 @@ if [ ! -f "$testpmd" ] ; then
> >>   fi
> >>
> >>   if ldd $testpmd | grep -q librte_ ; then
> >> -   export LD_LIBRARY_PATH=$build/lib:$LD_LIBRARY_PATH
> >> +   export LD_LIBRARY_PATH=$build/drivers:$build/lib:$LD_LIBRARY_PATH
> >>  libs='-d librte_mempool_ring.so -d librte_pmd_null.so'
> >>   else
> >>  libs=
> >> --
> >> 2.17.1
> >>
> > I'm surprised to see this.
> > So far, the CI ran fine without it, so something is different in the
> > environment.
> >
> > I can see that the RPATH entry disappeared from the testpmd binary.
> > Xenial:
> > # readelf -d build/app/dpdk-testpmd |grep RPATH
> >   0x000f (RPATH)  Library rpath:
> > [$ORIGIN/../lib:$ORIGIN/../drivers:X]
> >
> > (not sure what  purpose is, but different topic)
> >
> > Bionic:
> > # readelf -d build/app/dpdk-testpmd |grep RPATH
>
> It looks like RPATH just changed to be named RUNPATH in Bionic:
>
> # readelf -d build/app/dpdk-testpmd | grep R.*PATH
>   0x001d (RUNPATH)Library runpath:
> [$ORIGIN/../lib:$ORIGIN/../drivers:X]

Did some experiment with some test program and .so of mine.
TL;DR, if I understand correctly, RPATH on the binary applies to all
lookups, even in a subsequent .so code.
But RUNPATH only applies to the current ELF, meaning that the dlopen()
in my intermediate .so does not get it.

dlopen() is called from librte_eal.so, and RUNPATH on testpmd is not enough.


Details:
[dmarchan@dmarchan plop]$ cat main.c
extern void loader(void);

int main(int argc, char *argv[])
{
loader();
return 0;
}
[dmarchan@dmarchan plop]$ cat loader/loader.c
#include 
#include 

void loader(void)
{
if (dlopen("lib.so", RTLD_NOW) == NULL)
fprintf(stderr, "%s\n", dlerror());
}

[dmarchan@dmarchan plop]$ cat lib/lib.c
#include 

__attribute__((constructor))
static void plop(void)
{
fprintf(stdout, "plop\n");
}


# no rpath/runpath
[dmarchan@dmarchan plop]$ gcc -o lib/lib.so -Wall -Werror -shared
-fPIC lib/lib.c
[dmarchan@dmarchan plop]$ gcc -o loader/loader.so -Wall -Werror
-shared -fPIC loader/loader.c -ldl
[dmarchan@dmarchan plop]$ gcc -o main -Wall -Werror main.c loader/loader.so
[dmarchan@dmarchan plop]$ readelf -d main |grep R.*PATH
[dmarchan@dmarchan plop]$ ./main
lib.so: cannot open shared object file: No such file or directory

# using rpath on final binary
[dmarchan@dmarchan plop]$ gcc -o main -Wall -Werror main.c
loader/loader.so -Wl,-rpath,loader:lib
[dmarchan@dmarchan plop]$ readelf -d main |grep R.*PATH
 0x000f (RPATH)  Library rpath: [loader:lib]
[dmarchan@dmarchan plop]$ ./main
plop

# using runpath on final binary
[dmarchan@dmarchan plop]$ gcc -o main -Wall -Werror main.c
loader/loader.so -Wl,-enable-new-dtag,-rpath,loader:lib
[dmarchan@dmarchan plop]$ readelf -d main |grep R.*PATH
 0x001d (RUNPATH)Library runpath: [loader:lib]
[dmarchan@dmarchan plop]$ ./main
lib.so: cannot open shared object file: No such file or directory

# using runpath on loader
[dmarchan@dmarchan plop]$ gcc -o loader/loader.so -Wall -Werror
-shared -fPIC loader/loader.c -ldl -Wl,-enable-new-dtag,-rpath,lib
[dmarchan@dmarchan plop]$ readelf -d loader/loader.so |grep R.*PATH
 0x001d (RUNPATH)Library runpath: [lib]
[dmarchan@dmarchan plop]$ gcc -o main -Wall -Werror main.c
loader/loader.so -Wl,-enable-new-dtag,-rpath,loader
[dmarchan@dmarchan plop]$ readelf -d main |grep R.*PATH
 0x001d (RUNPATH)Library runpath: [loader]
[dmarchan@dmarchan plop]$ ./main
plop


> > Adding Bruce and Kevin, as I think this is the same issue than:
> > http://mails.dpdk.org/archives/dev/2019-December/153627.html
> > Could it be a change in meson?
>
> Yes, looks like the same error to me.
>
> I'm not sure this is solely a meson issue, I often need to pass -d
> librte_mempool_ring.so when using make builds too. Maybe I'm missing
> something here?

In a make build directory, all libraries ends up in the same lib/
directory and the test-null.sh script work with the current
LD_LIBRARY_PATH.


Ruifeng patch seems valid to me, but I would love some explanations in
the commitlog.

--
David Marchand

Re: [dpdk-dev] [PATCH 2/2] devtools: add path to additional shared object files

[Richardson, Bruce]

> -Original Message-
> From: David Marchand 
> Sent: Wednesday, December 18, 2019 3:32 PM
> To: Laatz, Kevin 
> Cc: Ruifeng Wang ; Richardson, Bruce
> ; Aaron Conole ; Michael
> Santana ; Thomas Monjalon
> ; Yigit, Ferruh ; Andrew
> Rybchenko ; dev ; Gavin Hu
> ; Honnappa Nagarahalli ;
> nd 
> Subject: Re: [dpdk-dev] [PATCH 2/2] devtools: add path to additional
> shared object files
> 
> On Wed, Dec 18, 2019 at 2:43 PM Laatz, Kevin 
> wrote:
> >
> > On 18/12/2019 08:23, David Marchand wrote:
> > > On Wed, Dec 18, 2019 at 6:39 AM Ruifeng Wang 
> wrote:
> > >> librte_mempool_ring.so and librte_pmd_null.so are in 'drivers'
> folder.
> > >> Add 'drivers' into LD_LIBRARY_PATH so that testpmd can find and
> > >> make use of these shared libraries.
> > >>
> > >> Signed-off-by: Ruifeng Wang 
> > >> Reviewed-by: Gavin Hu 
> > >> ---
> > >>   devtools/test-null.sh | 2 +-
> > >>   1 file changed, 1 insertion(+), 1 deletion(-)
> > >>
> > >> diff --git a/devtools/test-null.sh b/devtools/test-null.sh index
> > >> f39af2c06..548de8113 100755
> > >> --- a/devtools/test-null.sh
> > >> +++ b/devtools/test-null.sh
> > >> @@ -20,7 +20,7 @@ if [ ! -f "$testpmd" ] ; then
> > >>   fi
> > >>
> > >>   if ldd $testpmd | grep -q librte_ ; then
> > >> -   export LD_LIBRARY_PATH=$build/lib:$LD_LIBRARY_PATH
> > >> +   export
> > >> + LD_LIBRARY_PATH=$build/drivers:$build/lib:$LD_LIBRARY_PATH
> > >>  libs='-d librte_mempool_ring.so -d librte_pmd_null.so'
> > >>   else
> > >>  libs=
> > >> --
> > >> 2.17.1
> > >>
> > > I'm surprised to see this.
> > > So far, the CI ran fine without it, so something is different in the
> > > environment.
> > >
> > > I can see that the RPATH entry disappeared from the testpmd binary.
> > > Xenial:
> > > # readelf -d build/app/dpdk-testpmd |grep RPATH
> > >   0x000f (RPATH)  Library rpath:
> > > [$ORIGIN/../lib:$ORIGIN/../drivers:X]
> > >
> > > (not sure what  purpose is, but different topic)
> > >
> > > Bionic:
> > > # readelf -d build/app/dpdk-testpmd |grep RPATH
> >
> > It looks like RPATH just changed to be named RUNPATH in Bionic:
> >
> > # readelf -d build/app/dpdk-testpmd | grep R.*PATH
> >   0x001d (RUNPATH)Library runpath:
> > [$ORIGIN/../lib:$ORIGIN/../drivers:X]
> 
> Did some experiment with some test program and .so of mine.
> TL;DR, if I understand correctly, RPATH on the binary applies to all
> lookups, even in a subsequent .so code.
> But RUNPATH only applies to the current ELF, meaning that the dlopen() in
> my intermediate .so does not get it.
> 
> dlopen() is called from librte_eal.so, and RUNPATH on testpmd is not
> enough.
> 
> 
> Details:
> [dmarchan@dmarchan plop]$ cat main.c
> extern void loader(void);
> 
> int main(int argc, char *argv[])
> {
> loader();
> return 0;
> }
> [dmarchan@dmarchan plop]$ cat loader/loader.c #include  #include
> 
> 
> void loader(void)
> {
> if (dlopen("lib.so", RTLD_NOW) == NULL)
> fprintf(stderr, "%s\n", dlerror()); }
> 
> [dmarchan@dmarchan plop]$ cat lib/lib.c
> #include 
> 
> __attribute__((constructor))
> static void plop(void)
> {
> fprintf(stdout, "plop\n");
> }
> 
> 
> # no rpath/runpath
> [dmarchan@dmarchan plop]$ gcc -o lib/lib.so -Wall -Werror -shared -fPIC
> lib/lib.c [dmarchan@dmarchan plop]$ gcc -o loader/loader.so -Wall -Werror
> -shared -fPIC loader/loader.c -ldl [dmarchan@dmarchan plop]$ gcc -o main -
> Wall -Werror main.c loader/loader.so [dmarchan@dmarchan plop]$ readelf -d
> main |grep R.*PATH [dmarchan@dmarchan plop]$ ./main
> lib.so: cannot open shared object file: No such file or directory
> 
> # using rpath on final binary
> [dmarchan@dmarchan plop]$ gcc -o main -Wall -Werror main.c
> loader/loader.so -Wl,-rpath,loader:lib [dmarchan@dmarchan plop]$ readelf -
> d main |grep R.*PATH
>  0x000f (RPATH)  Library rpath: [loader:lib]
> [dmarchan@dmarchan plop]$ ./main
> plop
> 
> # using runpath on final binary
> [dmarchan@dmarchan plop]$ gcc -o main -Wall -Werror main.c
> loader/loader.so -Wl,-enable-new-dtag,-rpath,loader:lib
> [dmarchan@dmarchan plop]$ readelf -d main |grep R.*PATH
>  0x001d (RUNPATH)Library runpath: [loader:lib]
> [dmarchan@dmarchan plop]$ ./main
> lib.so: cannot open shared object file: No such file or directory
> 
> # using runpath on loader
> [dmarchan@dmarchan plop]$ gcc -o loader/loader.so -Wall -Werror -shared -
> fPIC loader/loader.c -ldl -Wl,-enable-new-dtag,-rpath,lib
> [dmarchan@dmarchan plop]$ readelf -d loader/loader.so |grep R.*PATH
>  0x001d (RUNPATH)Library runpath: [lib]
> [dmarchan@dmarchan plop]$ gcc -o main -Wall -Werror main.c
> loader/loader.so -Wl,-enable-new-dtag,-rpath,loader
> [dmarchan@dmarchan plop]$ readelf -d main |grep R.*PATH
>  0x001d (RUNPATH)Library runpath: [loader]
> [dmarchan@dmarchan plop]$ ./main
> plop
> 
> 
> > > Adding Bruce and Kevin, as I think this 

[dpdk-dev] [PATCH v2 1/5] ipsec: move ipsec sad name length into .h

[Vladimir Medvedkin]

Move IPSEC_SAD_NAMESIZE into public header
and rename it to RTE_IPSEC_SAD_NAMESIZE

Signed-off-by: Vladimir Medvedkin 
---
 lib/librte_ipsec/ipsec_sad.c | 20 ++--
 lib/librte_ipsec/rte_ipsec_sad.h |  2 ++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/librte_ipsec/ipsec_sad.c b/lib/librte_ipsec/ipsec_sad.c
index db2c44c..2c994ed 100644
--- a/lib/librte_ipsec/ipsec_sad.c
+++ b/lib/librte_ipsec/ipsec_sad.c
@@ -20,7 +20,6 @@
  * indicate presence of entries with the same SPI in DIP and DIP+SIP tables.
  */
 
-#define IPSEC_SAD_NAMESIZE 64
 #define SAD_PREFIX "SAD_"
 /* "SAD_" */
 #define SAD_FORMAT SAD_PREFIX "%s"
@@ -34,7 +33,7 @@ struct hash_cnt {
 };
 
 struct rte_ipsec_sad {
-   char name[IPSEC_SAD_NAMESIZE];
+   char name[RTE_IPSEC_SAD_NAMESIZE];
struct rte_hash *hash[RTE_IPSEC_SAD_KEY_TYPE_MASK];
/* Array to track number of more specific rules
 * (spi_dip or spi_dip_sip). Used only in add/delete
@@ -231,7 +230,7 @@ struct rte_ipsec_sad *
 rte_ipsec_sad_create(const char *name, const struct rte_ipsec_sad_conf *conf)
 {
char hash_name[RTE_HASH_NAMESIZE];
-   char sad_name[IPSEC_SAD_NAMESIZE];
+   char sad_name[RTE_IPSEC_SAD_NAMESIZE];
struct rte_tailq_entry *te;
struct rte_ipsec_sad_list *sad_list;
struct rte_ipsec_sad *sad, *tmp_sad = NULL;
@@ -249,8 +248,8 @@ rte_ipsec_sad_create(const char *name, const struct 
rte_ipsec_sad_conf *conf)
return NULL;
}
 
-   ret = snprintf(sad_name, IPSEC_SAD_NAMESIZE, SAD_FORMAT, name);
-   if (ret < 0 || ret >= IPSEC_SAD_NAMESIZE) {
+   ret = snprintf(sad_name, RTE_IPSEC_SAD_NAMESIZE, SAD_FORMAT, name);
+   if (ret < 0 || ret >= RTE_IPSEC_SAD_NAMESIZE) {
rte_errno = ENAMETOOLONG;
return NULL;
}
@@ -326,7 +325,8 @@ rte_ipsec_sad_create(const char *name, const struct 
rte_ipsec_sad_conf *conf)
/* guarantee there's no existing */
TAILQ_FOREACH(te, sad_list, next) {
tmp_sad = (struct rte_ipsec_sad *)te->data;
-   if (strncmp(sad_name, tmp_sad->name, IPSEC_SAD_NAMESIZE) == 0)
+   if (strncmp(sad_name, tmp_sad->name,
+   RTE_IPSEC_SAD_NAMESIZE) == 0)
break;
}
if (te != NULL) {
@@ -354,14 +354,14 @@ rte_ipsec_sad_create(const char *name, const struct 
rte_ipsec_sad_conf *conf)
 struct rte_ipsec_sad *
 rte_ipsec_sad_find_existing(const char *name)
 {
-   char sad_name[IPSEC_SAD_NAMESIZE];
+   char sad_name[RTE_IPSEC_SAD_NAMESIZE];
struct rte_ipsec_sad *sad = NULL;
struct rte_tailq_entry *te;
struct rte_ipsec_sad_list *sad_list;
int ret;
 
-   ret = snprintf(sad_name, IPSEC_SAD_NAMESIZE, SAD_FORMAT, name);
-   if (ret < 0 || ret >= IPSEC_SAD_NAMESIZE) {
+   ret = snprintf(sad_name, RTE_IPSEC_SAD_NAMESIZE, SAD_FORMAT, name);
+   if (ret < 0 || ret >= RTE_IPSEC_SAD_NAMESIZE) {
rte_errno = ENAMETOOLONG;
return NULL;
}
@@ -372,7 +372,7 @@ rte_ipsec_sad_find_existing(const char *name)
rte_mcfg_tailq_read_lock();
TAILQ_FOREACH(te, sad_list, next) {
sad = (struct rte_ipsec_sad *) te->data;
-   if (strncmp(sad_name, sad->name, IPSEC_SAD_NAMESIZE) == 0)
+   if (strncmp(sad_name, sad->name, RTE_IPSEC_SAD_NAMESIZE) == 0)
break;
}
rte_mcfg_tailq_read_unlock();
diff --git a/lib/librte_ipsec/rte_ipsec_sad.h b/lib/librte_ipsec/rte_ipsec_sad.h
index 8386f73..dcc8224 100644
--- a/lib/librte_ipsec/rte_ipsec_sad.h
+++ b/lib/librte_ipsec/rte_ipsec_sad.h
@@ -47,6 +47,8 @@ union rte_ipsec_sad_key {
struct rte_ipsec_sadv6_key  v6;
 };
 
+/** Max number of characters in SAD name. */
+#define RTE_IPSEC_SAD_NAMESIZE 64
 /** Flag to create SAD with ipv6 dip and sip addresses */
 #define RTE_IPSEC_SAD_FLAG_IPV60x1
 /** Flag to support reader writer concurrency */
-- 
2.7.4

[dpdk-dev] [PATCH v2 0/5] integrate librte_ipsec SAD into ipsec-secgw

[Vladimir Medvedkin]

This series integrates SA database (SAD) capabilities from ipsec library.
The goal is to make ipsec-secgw RFC compliant regarding inbound SAD.
Also patch series removes hardcoded limitation for maximum number of SA's
and SP's.

v2:
 - get rid of maximum sp limitation

Vladimir Medvedkin (5):
  ipsec: move ipsec sad name length into .h
  examples/ipsec-secgw: implement inbound SAD
  examples/ipsec-secgw: integrate inbound SAD
  examples/ipsec-secgw: get rid of maximum sa limitation
  examples/ipsec-secgw: get rid of maximum sp limitation

 examples/ipsec-secgw/Makefile  |   1 +
 examples/ipsec-secgw/ipsec-secgw.c |   4 +-
 examples/ipsec-secgw/ipsec.h   |  13 +-
 examples/ipsec-secgw/meson.build   |   2 +-
 examples/ipsec-secgw/sa.c  | 236 +++--
 examples/ipsec-secgw/sad.c |  90 ++
 examples/ipsec-secgw/sad.h |  74 
 examples/ipsec-secgw/sp4.c | 141 --
 examples/ipsec-secgw/sp6.c | 138 --
 lib/librte_ipsec/ipsec_sad.c   |  20 ++--
 lib/librte_ipsec/rte_ipsec_sad.h   |   2 +
 11 files changed, 474 insertions(+), 247 deletions(-)
 create mode 100644 examples/ipsec-secgw/sad.c
 create mode 100644 examples/ipsec-secgw/sad.h

-- 
2.7.4

[dpdk-dev] [PATCH v2 2/5] examples/ipsec-secgw: implement inbound SAD

[Vladimir Medvedkin]

Add initial support for librte_ipsec SAD library

Signed-off-by: Vladimir Medvedkin 
---
 examples/ipsec-secgw/ipsec.h | 11 ++
 examples/ipsec-secgw/sad.c   | 90 
 examples/ipsec-secgw/sad.h   | 74 
 3 files changed, 175 insertions(+)
 create mode 100644 examples/ipsec-secgw/sad.c
 create mode 100644 examples/ipsec-secgw/sad.h

diff --git a/examples/ipsec-secgw/ipsec.h b/examples/ipsec-secgw/ipsec.h
index 8e07521..132286c 100644
--- a/examples/ipsec-secgw/ipsec.h
+++ b/examples/ipsec-secgw/ipsec.h
@@ -53,6 +53,17 @@ struct ipsec_xform;
 struct rte_mbuf;
 
 struct ipsec_sa;
+/*
+ * Keeps number of configured SA's of each type:
+ * transport
+ * v4 tunnel
+ * v6 tunnel
+ */
+struct ipsec_sa_cnt {
+   uint32_tnb_trn;
+   uint32_tnb_v4_tun;
+   uint32_tnb_v6_tun;
+};
 
 typedef int32_t (*ipsec_xform_fn)(struct rte_mbuf *m, struct ipsec_sa *sa,
struct rte_crypto_op *cop);
diff --git a/examples/ipsec-secgw/sad.c b/examples/ipsec-secgw/sad.c
new file mode 100644
index 000..bcac462
--- /dev/null
+++ b/examples/ipsec-secgw/sad.c
@@ -0,0 +1,90 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2019 Intel Corporation
+ */
+
+#include 
+
+#include "ipsec.h"
+#include "sad.h"
+
+int
+ipsec_sad_add(struct ipsec_sad *sad, struct ipsec_sa *sa)
+{
+   int ret;
+   union rte_ipsec_sad_key key = { {0} };
+
+   /* spi field is common for ipv4 and ipv6 key types */
+   key.v4.spi = rte_cpu_to_be_32(sa->spi);
+   switch (WITHOUT_TRANSPORT_VERSION(sa->flags)) {
+   case IP4_TUNNEL:
+   key.v4.dip = rte_cpu_to_be_32(sa->dst.ip.ip4);
+   key.v4.sip = rte_cpu_to_be_32(sa->src.ip.ip4);
+   ret = rte_ipsec_sad_add(sad->sad_v4, &key,
+   RTE_IPSEC_SAD_SPI_DIP_SIP, sa);
+   if (ret != 0)
+   return ret;
+   break;
+   case IP6_TUNNEL:
+   memcpy(key.v6.dip, sa->dst.ip.ip6.ip6,
+   sizeof(key.v6.dip));
+   memcpy(key.v6.sip, sa->src.ip.ip6.ip6,
+   sizeof(key.v6.sip));
+   ret = rte_ipsec_sad_add(sad->sad_v6, &key,
+   RTE_IPSEC_SAD_SPI_DIP_SIP, sa);
+   if (ret != 0)
+   return ret;
+   break;
+   case TRANSPORT:
+   if (sp4_spi_present(sa->spi, 1, NULL, NULL) >= 0) {
+   ret = rte_ipsec_sad_add(sad->sad_v4, &key,
+   RTE_IPSEC_SAD_SPI_ONLY, sa);
+   if (ret != 0)
+   return ret;
+   }
+
+   if (sp6_spi_present(sa->spi, 1, NULL, NULL) >= 0) {
+   ret = rte_ipsec_sad_add(sad->sad_v6, &key,
+   RTE_IPSEC_SAD_SPI_ONLY, sa);
+   if (ret != 0)
+   return ret;
+   }
+   }
+
+   return 0;
+}
+
+int
+ipsec_sad_create(const char *name, struct ipsec_sad *sad,
+   int socket_id, struct ipsec_sa_cnt *sa_cnt)
+{
+   int ret;
+   struct rte_ipsec_sad_conf sad_conf;
+   char sad_name[RTE_IPSEC_SAD_NAMESIZE];
+
+   ret = snprintf(sad_name, RTE_IPSEC_SAD_NAMESIZE, "%s_v4", name);
+   if (ret < 0 || ret >= RTE_IPSEC_SAD_NAMESIZE)
+   return -ENAMETOOLONG;
+
+   sad_conf.socket_id = socket_id;
+   sad_conf.flags = 0;
+   /* Make SAD have extra 25% of required number of entries */
+   sad_conf.max_sa[RTE_IPSEC_SAD_SPI_ONLY] = sa_cnt->nb_trn * 5 / 4;
+   sad_conf.max_sa[RTE_IPSEC_SAD_SPI_DIP] = 0;
+   sad_conf.max_sa[RTE_IPSEC_SAD_SPI_DIP_SIP] = sa_cnt->nb_v4_tun * 5 / 4;
+
+   sad->sad_v4 = rte_ipsec_sad_create(sad_name, &sad_conf);
+   if (sad->sad_v4 == NULL)
+   return -rte_errno;
+
+   ret = snprintf(sad_name, RTE_IPSEC_SAD_NAMESIZE, "%s_v6", name);
+   if (ret < 0 || ret >= RTE_IPSEC_SAD_NAMESIZE)
+   return -ENAMETOOLONG;
+   sad_conf.flags = RTE_IPSEC_SAD_FLAG_IPV6;
+   sad_conf.max_sa[RTE_IPSEC_SAD_SPI_DIP_SIP] = sa_cnt->nb_v6_tun * 5 / 4;
+
+   sad->sad_v6 = rte_ipsec_sad_create(name, &sad_conf);
+   if (sad->sad_v6 == NULL)
+   return -rte_errno;
+
+   return 0;
+}
diff --git a/examples/ipsec-secgw/sad.h b/examples/ipsec-secgw/sad.h
new file mode 100644
index 000..e754d57
--- /dev/null
+++ b/examples/ipsec-secgw/sad.h
@@ -0,0 +1,74 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2019 Intel Corporation
+ */
+
+#ifndef __SAD_H__
+#define __SAD_H__
+
+#include 
+
+struct ipsec_sad {
+   struct rte_ipsec_sad *sad_v4;
+   struct rte_ipsec_sad *sad_v6;
+};
+
+int ipsec_sad_create(const char *name, struct ipsec_sad *sad,
+   int socket_id, struct ipsec_sa_cnt *sa_cnt);
+
+int ipsec_sad_add(struct ipsec_s

[dpdk-dev] [PATCH v2 3/5] examples/ipsec-secgw: integrate inbound SAD

[Vladimir Medvedkin]

Integrate ipsec SAD support into secgw app:

1. Use SAD library for inbound SA lookup
2. Changes in struct sa_ctx:
  - sa array allocates dynamically depending on number of configured sa
  - All SA's are kept one by one without using SPI2IDX
3. SP's userdata now contain index of SA in sa_ctx instead of SPI
4. Get rid of SPI2IDX macro

Signed-off-by: Vladimir Medvedkin 
---
 examples/ipsec-secgw/Makefile  |   1 +
 examples/ipsec-secgw/ipsec-secgw.c |   4 +-
 examples/ipsec-secgw/ipsec.h   |   2 +-
 examples/ipsec-secgw/meson.build   |   2 +-
 examples/ipsec-secgw/sa.c  | 160 +
 examples/ipsec-secgw/sp4.c |  24 +++---
 examples/ipsec-secgw/sp6.c |  24 +++---
 7 files changed, 110 insertions(+), 107 deletions(-)

diff --git a/examples/ipsec-secgw/Makefile b/examples/ipsec-secgw/Makefile
index 851123b..8734b15 100644
--- a/examples/ipsec-secgw/Makefile
+++ b/examples/ipsec-secgw/Makefile
@@ -12,6 +12,7 @@ SRCS-y += esp.c
 SRCS-y += sp4.c
 SRCS-y += sp6.c
 SRCS-y += sa.c
+SRCS-y += sad.c
 SRCS-y += rt.c
 SRCS-y += ipsec_process.c
 SRCS-y += ipsec-secgw.c
diff --git a/examples/ipsec-secgw/ipsec-secgw.c 
b/examples/ipsec-secgw/ipsec-secgw.c
index 3b5aaf6..3e5f82e 100644
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -601,7 +601,7 @@ inbound_sp_sa(struct sp_ctx *sp, struct sa_ctx *sa, struct 
traffic_type *ip,
continue;
}
 
-   sa_idx = SPI2IDX(res);
+   sa_idx = res - 1;
if (!inbound_sa_check(sa, m, sa_idx)) {
rte_pktmbuf_free(m);
continue;
@@ -688,7 +688,7 @@ outbound_sp(struct sp_ctx *sp, struct traffic_type *ip,
j = 0;
for (i = 0; i < ip->num; i++) {
m = ip->pkts[i];
-   sa_idx = SPI2IDX(ip->res[i]);
+   sa_idx = ip->res[i] - 1;
if (ip->res[i] == DISCARD)
rte_pktmbuf_free(m);
else if (ip->res[i] == BYPASS)
diff --git a/examples/ipsec-secgw/ipsec.h b/examples/ipsec-secgw/ipsec.h
index 132286c..f731bf8 100644
--- a/examples/ipsec-secgw/ipsec.h
+++ b/examples/ipsec-secgw/ipsec.h
@@ -363,7 +363,7 @@ sp6_spi_present(uint32_t spi, int inbound, struct ip_addr 
ip_addr[2],
  * or -ENOENT otherwise.
  */
 int
-sa_spi_present(uint32_t spi, int inbound);
+sa_spi_present(struct sa_ctx *sa_ctx, uint32_t spi, int inbound);
 
 void
 sa_init(struct socket_ctx *ctx, int32_t socket_id);
diff --git a/examples/ipsec-secgw/meson.build b/examples/ipsec-secgw/meson.build
index 9ece345..6bd5b78 100644
--- a/examples/ipsec-secgw/meson.build
+++ b/examples/ipsec-secgw/meson.build
@@ -10,5 +10,5 @@ deps += ['security', 'lpm', 'acl', 'hash', 'ip_frag', 'ipsec']
 allow_experimental_apis = true
 sources = files(
'esp.c', 'ipsec.c', 'ipsec_process.c', 'ipsec-secgw.c',
-   'parser.c', 'rt.c', 'sa.c', 'sp4.c', 'sp6.c'
+   'parser.c', 'rt.c', 'sa.c', 'sad.c', 'sp4.c', 'sp6.c'
 )
diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index 7f046e3..8cc7b17 100644
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -24,6 +24,7 @@
 #include "ipsec.h"
 #include "esp.h"
 #include "parser.h"
+#include "sad.h"
 
 #define IPDEFTTL 64
 
@@ -134,9 +135,11 @@ const struct supported_aead_algo aead_algos[] = {
 
 static struct ipsec_sa sa_out[IPSEC_SA_MAX_ENTRIES];
 static uint32_t nb_sa_out;
+static struct ipsec_sa_cnt sa_out_cnt;
 
 static struct ipsec_sa sa_in[IPSEC_SA_MAX_ENTRIES];
 static uint32_t nb_sa_in;
+static struct ipsec_sa_cnt sa_in_cnt;
 
 static const struct supported_cipher_algo *
 find_match_cipher_algo(const char *cipher_keyword)
@@ -229,6 +232,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
struct rte_ipsec_session *ips;
uint32_t ti; /*token index*/
uint32_t *ri /*rule index*/;
+   struct ipsec_sa_cnt *sa_cnt;
uint32_t cipher_algo_p = 0;
uint32_t auth_algo_p = 0;
uint32_t aead_algo_p = 0;
@@ -241,6 +245,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
 
if (strcmp(tokens[0], "in") == 0) {
ri = &nb_sa_in;
+   sa_cnt = &sa_in_cnt;
 
APP_CHECK(*ri <= IPSEC_SA_MAX_ENTRIES - 1, status,
"too many sa rules, abort insertion\n");
@@ -251,6 +256,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
rule->direction = RTE_SECURITY_IPSEC_SA_DIR_INGRESS;
} else {
ri = &nb_sa_out;
+   sa_cnt = &sa_out_cnt;
 
APP_CHECK(*ri <= IPSEC_SA_MAX_ENTRIES - 1, status,
"too many sa rules, abort insertion\n");
@@ -280,13 +286,16 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
if (status->status < 0)
return;
 
-   if (strcmp(tokens[ti], "ipv4-tunnel") == 0)
+

[dpdk-dev] [PATCH v2 4/5] examples/ipsec-secgw: get rid of maximum sa limitation

[Vladimir Medvedkin]

Parse config file and save SA's into linked list
instead of flat array with predefined size.

Signed-off-by: Vladimir Medvedkin 
---
 examples/ipsec-secgw/sa.c | 78 +--
 1 file changed, 48 insertions(+), 30 deletions(-)

diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c
index 8cc7b17..32919fe 100644
--- a/examples/ipsec-secgw/sa.c
+++ b/examples/ipsec-secgw/sa.c
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "ipsec.h"
 #include "esp.h"
@@ -133,11 +134,17 @@ const struct supported_aead_algo aead_algos[] = {
}
 };
 
-static struct ipsec_sa sa_out[IPSEC_SA_MAX_ENTRIES];
+struct ipsec_sa_mgmt {
+   STAILQ_ENTRY(ipsec_sa_mgmt) next;
+   struct ipsec_sa sa;
+};
+STAILQ_HEAD(sa_head, ipsec_sa_mgmt);
+
+static struct sa_head sa_out_head = STAILQ_HEAD_INITIALIZER(sa_out_head);
 static uint32_t nb_sa_out;
 static struct ipsec_sa_cnt sa_out_cnt;
 
-static struct ipsec_sa sa_in[IPSEC_SA_MAX_ENTRIES];
+static struct sa_head sa_in_head = STAILQ_HEAD_INITIALIZER(sa_in_head);
 static uint32_t nb_sa_in;
 static struct ipsec_sa_cnt sa_in_cnt;
 
@@ -228,6 +235,8 @@ void
 parse_sa_tokens(char **tokens, uint32_t n_tokens,
struct parse_status *status)
 {
+   struct ipsec_sa_mgmt *sa_mgmt;
+   struct sa_head *head;
struct ipsec_sa *rule = NULL;
struct rte_ipsec_session *ips;
uint32_t ti; /*token index*/
@@ -243,27 +252,21 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
uint32_t portid_p = 0;
uint32_t fallback_p = 0;
 
+   sa_mgmt = calloc(1, sizeof(struct ipsec_sa_mgmt));
+   if (sa_mgmt == NULL)
+   return;
+
+   rule = &sa_mgmt->sa;
+
if (strcmp(tokens[0], "in") == 0) {
ri = &nb_sa_in;
sa_cnt = &sa_in_cnt;
-
-   APP_CHECK(*ri <= IPSEC_SA_MAX_ENTRIES - 1, status,
-   "too many sa rules, abort insertion\n");
-   if (status->status < 0)
-   return;
-
-   rule = &sa_in[*ri];
+   head = &sa_in_head;
rule->direction = RTE_SECURITY_IPSEC_SA_DIR_INGRESS;
} else {
ri = &nb_sa_out;
sa_cnt = &sa_out_cnt;
-
-   APP_CHECK(*ri <= IPSEC_SA_MAX_ENTRIES - 1, status,
-   "too many sa rules, abort insertion\n");
-   if (status->status < 0)
-   return;
-
-   rule = &sa_out[*ri];
+   head = &sa_out_head;
rule->direction = RTE_SECURITY_IPSEC_SA_DIR_EGRESS;
}
 
@@ -687,6 +690,7 @@ parse_sa_tokens(char **tokens, uint32_t n_tokens,
rule->portid = -1;
}
 
+   STAILQ_INSERT_TAIL(head, sa_mgmt, next);
*ri = *ri + 1;
 }
 
@@ -956,12 +960,13 @@ sa_add_address_inline_crypto(struct ipsec_sa *sa)
 }
 
 static int
-sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[],
+sa_add_rules(struct sa_ctx *sa_ctx, struct sa_head *entries,
uint32_t nb_entries, uint32_t inbound,
struct socket_ctx *skt_ctx)
 {
+   struct ipsec_sa_mgmt *sa_mgmt;
struct ipsec_sa *sa;
-   uint32_t i, idx;
+   uint32_t idx;
uint16_t iv_length, aad_length;
int inline_status;
int32_t rc;
@@ -970,15 +975,18 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa 
entries[],
/* for ESN upper 32 bits of SQN also need to be part of AAD */
aad_length = (app_sa_prm.enable_esn != 0) ? sizeof(uint32_t) : 0;
 
-   for (i = 0; i < nb_entries; i++) {
-   idx = i;
+   sa_mgmt = STAILQ_FIRST(entries);
+   for (idx = 0; idx < nb_entries; idx++) {
+   if (sa_mgmt == NULL)
+   rte_exit(EXIT_FAILURE, "SA mgmt queue is broken\n");
+
sa = &sa_ctx->sa[idx];
if (sa->spi != 0) {
printf("Index %u already in use by SPI %u\n",
idx, sa->spi);
return -EINVAL;
}
-   *sa = entries[i];
+   *sa = sa_mgmt->sa;
 
if (inbound) {
rc = ipsec_sad_add(&sa_ctx->sad, sa);
@@ -1114,20 +1122,29 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct 
ipsec_sa entries[],
 
print_one_sa_rule(sa, inbound);
}
+   sa_mgmt = STAILQ_NEXT(sa_mgmt, next);
}
 
+   for (sa_mgmt = STAILQ_FIRST(entries); sa_mgmt != NULL;
+   sa_mgmt = STAILQ_FIRST(entries)) {
+   STAILQ_REMOVE_HEAD(entries, next);
+   free(sa_mgmt);
+   }
+
+   STAILQ_INIT(entries);
+
return 0;
 }
 
 static inline int
-sa_out_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[],
+sa_out_add_rules(struct sa_ctx *sa_ctx, struct sa_head *entries,
uint32_t nb_en

[dpdk-dev] [PATCH v2 5/5] examples/ipsec-secgw: get rid of maximum sp limitation

[Vladimir Medvedkin]

Parse config file and save SP rules into linked list
instead of flat array with predefined size.

Signed-off-by: Vladimir Medvedkin 
---
 examples/ipsec-secgw/sp4.c | 121 ++---
 examples/ipsec-secgw/sp6.c | 118 +++
 2 files changed, 134 insertions(+), 105 deletions(-)

diff --git a/examples/ipsec-secgw/sp4.c b/examples/ipsec-secgw/sp4.c
index 1dcec52..f0938c5 100644
--- a/examples/ipsec-secgw/sp4.c
+++ b/examples/ipsec-secgw/sp4.c
@@ -8,6 +8,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -15,8 +16,6 @@
 #include "ipsec.h"
 #include "parser.h"
 
-#define MAX_ACL_RULE_NUM   1024
-
 #define IPV4_DST_FROM_SP(acr) \
(rte_cpu_to_be_32((acr).field[DST_FIELD_IPV4].value.u32))
 
@@ -97,16 +96,24 @@ static struct rte_acl_field_def ip4_defs[NUM_FIELDS_IPV4] = 
{
 
 RTE_ACL_RULE_DEF(acl4_rules, RTE_DIM(ip4_defs));
 
-static struct acl4_rules acl4_rules_out[MAX_ACL_RULE_NUM];
+struct ipsec_sp_mgmt {
+   STAILQ_ENTRY(ipsec_sp_mgmt) next;
+   struct acl4_rules   sp;
+};
+STAILQ_HEAD(sp_head, ipsec_sp_mgmt);
+
+static struct sp_head sp_out_head = STAILQ_HEAD_INITIALIZER(sp_out_head);
 static uint32_t nb_acl4_rules_out;
 
-static struct acl4_rules acl4_rules_in[MAX_ACL_RULE_NUM];
+static struct sp_head sp_in_head = STAILQ_HEAD_INITIALIZER(sp_in_head);
 static uint32_t nb_acl4_rules_in;
 
 void
 parse_sp4_tokens(char **tokens, uint32_t n_tokens,
struct parse_status *status)
 {
+   struct ipsec_sp_mgmt *sp_mgmt;
+   struct sp_head *head;
struct acl4_rules *rule_ipv4 = NULL;
 
uint32_t *ri = NULL; /* rule index */
@@ -124,25 +131,18 @@ parse_sp4_tokens(char **tokens, uint32_t n_tokens,
uint32_t sport_p = 0;
uint32_t dport_p = 0;
 
+   sp_mgmt = calloc(1, sizeof(struct ipsec_sp_mgmt));
+   if (sp_mgmt == NULL)
+   return;
+
+   rule_ipv4 = &sp_mgmt->sp;
+
if (strcmp(tokens[1], "in") == 0) {
ri = &nb_acl4_rules_in;
-
-   APP_CHECK(*ri <= MAX_ACL_RULE_NUM - 1, status,
-   "too many sp rules, abort insertion\n");
-   if (status->status < 0)
-   return;
-
-   rule_ipv4 = &acl4_rules_in[*ri];
-
+   head = &sp_in_head;
} else if (strcmp(tokens[1], "out") == 0) {
ri = &nb_acl4_rules_out;
-
-   APP_CHECK(*ri <= MAX_ACL_RULE_NUM - 1, status,
-   "too many sp rules, abort insertion\n");
-   if (status->status < 0)
-   return;
-
-   rule_ipv4 = &acl4_rules_out[*ri];
+   head = &sp_out_head;
} else {
APP_CHECK(0, status, "unrecognized input \"%s\", expect"
" \"in\" or \"out\"\n", tokens[ti]);
@@ -400,6 +400,7 @@ parse_sp4_tokens(char **tokens, uint32_t n_tokens,
if (status->status < 0)
return;
 
+   STAILQ_INSERT_TAIL(head, sp_mgmt, next);
*ri = *ri + 1;
 }
 
@@ -443,18 +444,34 @@ dump_ip4_rules(const struct acl4_rules *rule, int32_t 
num, int32_t extra)
 }
 
 static struct rte_acl_ctx *
-acl4_init(const char *name, int32_t socketid, const struct acl4_rules *rules,
+acl4_init(const char *name, int32_t socketid, struct sp_head *rules_list,
uint32_t rules_nb)
 {
char s[PATH_MAX];
struct rte_acl_param acl_param;
struct rte_acl_config acl_build_param;
struct rte_acl_ctx *ctx;
+   struct acl4_rules *rules; /* Temporary array containing rules */
+   struct ipsec_sp_mgmt *sp_mgmt;
+   uint32_t i;
 
-   printf("Creating SP context with %u max rules\n", MAX_ACL_RULE_NUM);
+   printf("Creating SP context with %u rules\n", rules_nb);
 
memset(&acl_param, 0, sizeof(acl_param));
 
+   /* Create flat array of rules which is needed for acl context */
+   rules = calloc(rules_nb, sizeof(struct acl4_rules));
+   if (rules == NULL)
+   rte_exit(EXIT_FAILURE, "Can't allocate rules array\n");
+
+   sp_mgmt = STAILQ_FIRST(rules_list);
+   for (i = 0; i < rules_nb; i++) {
+   if (sp_mgmt == NULL)
+   rte_exit(EXIT_FAILURE, "SP list is broken\n");
+   rules[i] = sp_mgmt->sp;
+   sp_mgmt = STAILQ_NEXT(sp_mgmt, next);
+   }
+
/* Create ACL contexts */
snprintf(s, sizeof(s), "%s_%d", name, socketid);
 
@@ -464,7 +481,7 @@ acl4_init(const char *name, int32_t socketid, const struct 
acl4_rules *rules,
acl_param.name = s;
acl_param.socket_id = socketid;
acl_param.rule_size = RTE_ACL_RULE_SZ(RTE_DIM(ip4_defs));
-   acl_param.max_rule_num = MAX_ACL_RULE_NUM;
+   acl_param.max_rule_num = rules_nb;
 
ctx = rte_acl_create(&acl_param);
if (ctx == NULL)
@@ -486,6 +503,7 @@ acl4_init(const char *name, int32_t socketid, const

Re: [dpdk-dev] [PATCH v4] app/test: fix build when ring PMD is disabled

[Bruce Richardson]

On Wed, Dec 18, 2019 at 11:58:31AM +, Reshma Pattan wrote:
> Some unit tests has dependency on RING PMD,
> so this patch is trying to fix those and other
> closely related issues.
> 
> 1)pdump, latency, bitrate, ring PMD and test_event_eth_tx_adapter
> unit tests are dependent on ring PMD, so compile those
> tests only when ring PMD is enabled else ignore.
> 
> 2)get rid of make file error which was added by bond unit test
> for ring PMD disabled case which is not necessary.
> 
> 3)Tx adapter UT is dependent on RING PMD, but it was
> observed that it was missing from the run in meson
> build, so added it. TX adapter UT uses 'sw event and
> 'null' pmd drivers, so for shared builds the drivers .so
> path has to be passed to the test args of meson UT run.
> 
> Fixes: 086eb64db3 ("test/pdump: add unit test for pdump library")
> Fixes: fdeb30fa71 ("test/bitrate: add unit tests for bitrate library")
> Fixes: 1e3676a06e ("test/latency: add unit tests for latencystats library")
> Fixes: 46cf97e4bb ("eventdev: add test for eth Tx adapter")
> Fixes: d23e09e0ef ("app/test: link with ring pmd when needed")
> 
> CC: sta...@dpdk.org
> CC: Nikhil Rao 
> CC: Chas Williams 
> CC: Bruce Richardson 
> CC: Stephen Hemminger 
> 
> Reported-by: Stephen Hemminger 
> Signed-off-by: Reshma Pattan 
> ---
> v4: fix event_eth_tx_adapter_autotest for shared build
> as reported by travis-ci
> https://travis-ci.com/ovsrobot/dpdk/jobs/249598391
> v3: add missing test event_eth_tx_adapter_autotest.
> Add link bonding mode4 test to drivers test.
> v2: fix comments of v1 and combine the patches 1/2 and 2/2 of v1
> ---
>  app/test/Makefile| 16 +---
>  app/test/meson.build | 37 +++--
>  app/test/process.h   |  8 
>  app/test/test.c  |  2 ++
>  4 files changed, 38 insertions(+), 25 deletions(-)
> 

>  
>  test_args = [num_cores_arg]
> +
> +
One blank line is probably enough.

>  foreach arg : fast_test_names
> + if (get_option('default_library') == 'shared' and
> + arg == 'event_eth_tx_adapter_autotest')
> + foreach drv:dpdk_drivers
> + test_args += ['-d', drv.full_path().split('.a')[0] + 
> '.so']
> + endforeach
> + endif

Does this need to be limited to just this one test? Why not just set the
test args outside the loop to always include all drivers if it is a shared
build?

/Bruce

Re: [dpdk-dev] [PATCH v4] app/test: fix build when ring PMD is disabled

[Pattan, Reshma]

> -Original Message-
> From: Bruce Richardson 



> 
> >  foreach arg : fast_test_names
> > +   if (get_option('default_library') == 'shared' and
> > +   arg == 'event_eth_tx_adapter_autotest')
> > +   foreach drv:dpdk_drivers
> > +   test_args += ['-d', drv.full_path().split('.a')[0] + 
> > '.so']
> > +   endforeach
> > +   endif
> 
> Does this need to be limited to just this one test? Why not just set the test 
> args
> outside the loop to always include all drivers if it is a shared build?
> 

I was seeing  couple of other UTs failing when I set the testargs commonly for 
all tests.
I am not sure about why, so enabling only for that particular UT which actually 
needed them.

APP: HPET is not enabled, using TSC as default timer
RTE>>alarm_autotest^M
check if the callback will be called
Callback not called
Test Failed
RTE>>

RTE>>interrupt_autotest^M
Check unknown valid interrupt full path
callback has not been called
failure occurred during checking unknown valid interrupt full path
Clearing for interrupt tests
Test Failed
RTE>>

Thanks,
Reshma
 

Re: [dpdk-dev] [PATCH] event/octeontx2: use wfe while waiting for head

[Honnappa Nagarahalli]

> >> >>
> >> >>  static __rte_always_inline void
> >> >> -otx2_ssogws_head_wait(struct otx2_ssogws *ws, const uint8_t
> >> >wait_flag)
> >> >> +otx2_ssogws_head_wait(struct otx2_ssogws *ws)
> >> >>  {
> >> >> -   while (wait_flag && !(otx2_read64(ws->tag_op) &
> >> >BIT_ULL(35)))
> >> >> +#ifdef RTE_ARCH_ARM64
> >> >> +   uint64_t tag;
> >> >> +
> >> >> +   asm volatile (
> >> >> +   "   ldr %[tag], [%[tag_op]] \n"
> >> >"ldxr" should be used, exclusive-load is required to "monitor" the
> >> >location, then a write to the location will cause clear of the
> >> >exclusive monitor, thus a wake up event is generated implicitly.
> >>
> >> As I have mentioned in the commit log:
> >> "SSO signals EVENTI to allow cores to exit from wfe when they are
> >> waiting for specific operations in which one of them is setting HEAD
> >> bit in GWS_TAG."
> >If you have other expected wake up sources, that is ok. Just curious is
> >this signal explicitly sent to quit WFE?
> 
> AFAIK yes, explicitly sent to quit WFE.
Pavan, is the wake up event sent to the particular core that is waiting on this 
head or is it sent to all the cores?

[dpdk-dev] ipsec-secgw app error

[Shah, Rahul R]

Hi,

There is a type/error (port vs portid) on line 75 in the 
ipsec-secgw/ipsec-secgw.c file.

Line 75: #define UNPROTECTED_PORT(port) (unprotected_port_mask & (1 << portid))

Thanks,
Rahul Shah
Software Engineer - NASE/NPG/DPG
Intel Corporation
Email: rahul.r.s...@intel.com

Re: [dpdk-dev] [PATCH v1] net/ice: add new device IDs

[Ye Xiaolong]

On 12/18, Ting Xu wrote:
>This patch added new device IDs for C822N.
>
>Signed-off-by: Ting Xu 
>---
> drivers/net/ice/ice_ethdev.c | 3 +++
> 1 file changed, 3 insertions(+)
>
>diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
>index de189daba..2cbd82c94 100644
>--- a/drivers/net/ice/ice_ethdev.c
>+++ b/drivers/net/ice/ice_ethdev.c
>@@ -163,6 +163,9 @@ static const struct rte_pci_id pci_id_ice_map[] = {
>   { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810_XXV_BACKPLANE) },
>   { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810_XXV_QSFP) },
>   { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810_XXV_SFP) },
>+  { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_C822N_BACKPLANE) },
>+  { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_C822N_QSFP) },
>+  { RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_C822N_SFP) },
>   { .vendor_id = 0, /* sentinel */ },
> };
> 
>-- 
>2.17.1
>

Acked-by: Xiaolong Ye 

Applied to dpdk-next-net-intel, Thanks.

Re: [dpdk-dev] [PATCH 2/2] devtools: add path to additional shared object files

[Ruifeng Wang]

> -Original Message-
> From: David Marchand 
> Sent: Wednesday, December 18, 2019 23:32
> To: Laatz, Kevin 
> Cc: Ruifeng Wang ; Bruce Richardson
> ; Aaron Conole ;
> Michael Santana ; tho...@monjalon.net; Yigit,
> Ferruh ; Andrew Rybchenko
> ; dev ; Gavin Hu
> ; Honnappa Nagarahalli
> ; nd 
> Subject: Re: [dpdk-dev] [PATCH 2/2] devtools: add path to additional shared
> object files
> 
> On Wed, Dec 18, 2019 at 2:43 PM Laatz, Kevin  wrote:
> >
> > On 18/12/2019 08:23, David Marchand wrote:
> > > On Wed, Dec 18, 2019 at 6:39 AM Ruifeng Wang 
> wrote:
> > >> librte_mempool_ring.so and librte_pmd_null.so are in 'drivers' folder.
> > >> Add 'drivers' into LD_LIBRARY_PATH so that testpmd can find and
> > >> make use of these shared libraries.
> > >>
> > >> Signed-off-by: Ruifeng Wang 
> > >> Reviewed-by: Gavin Hu 
> > >> ---
> > >>   devtools/test-null.sh | 2 +-
> > >>   1 file changed, 1 insertion(+), 1 deletion(-)
> > >>
> > >> diff --git a/devtools/test-null.sh b/devtools/test-null.sh index
> > >> f39af2c06..548de8113 100755
> > >> --- a/devtools/test-null.sh
> > >> +++ b/devtools/test-null.sh
> > >> @@ -20,7 +20,7 @@ if [ ! -f "$testpmd" ] ; then
> > >>   fi
> > >>
> > >>   if ldd $testpmd | grep -q librte_ ; then
> > >> -   export LD_LIBRARY_PATH=$build/lib:$LD_LIBRARY_PATH
> > >> +   export
> > >> + LD_LIBRARY_PATH=$build/drivers:$build/lib:$LD_LIBRARY_PATH
> > >>  libs='-d librte_mempool_ring.so -d librte_pmd_null.so'
> > >>   else
> > >>  libs=
> > >> --
> > >> 2.17.1
> > >>
> > > I'm surprised to see this.
> > > So far, the CI ran fine without it, so something is different in the
> > > environment.
> > >
> > > I can see that the RPATH entry disappeared from the testpmd binary.
> > > Xenial:
> > > # readelf -d build/app/dpdk-testpmd |grep RPATH
> > >   0x000f (RPATH)  Library rpath:
> > > [$ORIGIN/../lib:$ORIGIN/../drivers:X]
> > >
> > > (not sure what  purpose is, but different topic)
> > >
> > > Bionic:
> > > # readelf -d build/app/dpdk-testpmd |grep RPATH
> >
> > It looks like RPATH just changed to be named RUNPATH in Bionic:
> >
> > # readelf -d build/app/dpdk-testpmd | grep R.*PATH
> >   0x001d (RUNPATH)Library runpath:
> > [$ORIGIN/../lib:$ORIGIN/../drivers:X]
> 
> Did some experiment with some test program and .so of mine.
> TL;DR, if I understand correctly, RPATH on the binary applies to all lookups,
> even in a subsequent .so code.
> But RUNPATH only applies to the current ELF, meaning that the dlopen() in
> my intermediate .so does not get it.
> 
> dlopen() is called from librte_eal.so, and RUNPATH on testpmd is not enough.
> 
Thanks for your experiment and analysis. Really happy to know more around the 
issue.

> 
> Details:
> [dmarchan@dmarchan plop]$ cat main.c
> extern void loader(void);
> 
> int main(int argc, char *argv[])
> {
> loader();
> return 0;
> }
> [dmarchan@dmarchan plop]$ cat loader/loader.c #include 
> #include 
> 
> void loader(void)
> {
> if (dlopen("lib.so", RTLD_NOW) == NULL)
> fprintf(stderr, "%s\n", dlerror()); }
> 
> [dmarchan@dmarchan plop]$ cat lib/lib.c
> #include 
> 
> __attribute__((constructor))
> static void plop(void)
> {
> fprintf(stdout, "plop\n");
> }
> 
> 
> # no rpath/runpath
> [dmarchan@dmarchan plop]$ gcc -o lib/lib.so -Wall -Werror -shared -fPIC
> lib/lib.c [dmarchan@dmarchan plop]$ gcc -o loader/loader.so -Wall -Werror -
> shared -fPIC loader/loader.c -ldl [dmarchan@dmarchan plop]$ gcc -o main -
> Wall -Werror main.c loader/loader.so [dmarchan@dmarchan plop]$ readelf -
> d main |grep R.*PATH [dmarchan@dmarchan plop]$ ./main
> lib.so: cannot open shared object file: No such file or directory
> 
> # using rpath on final binary
> [dmarchan@dmarchan plop]$ gcc -o main -Wall -Werror main.c
> loader/loader.so -Wl,-rpath,loader:lib [dmarchan@dmarchan plop]$ readelf -
> d main |grep R.*PATH
>  0x000f (RPATH)  Library rpath: [loader:lib]
> [dmarchan@dmarchan plop]$ ./main
> plop
> 
> # using runpath on final binary
> [dmarchan@dmarchan plop]$ gcc -o main -Wall -Werror main.c
> loader/loader.so -Wl,-enable-new-dtag,-rpath,loader:lib
> [dmarchan@dmarchan plop]$ readelf -d main |grep R.*PATH
>  0x001d (RUNPATH)Library runpath: [loader:lib]
> [dmarchan@dmarchan plop]$ ./main
> lib.so: cannot open shared object file: No such file or directory
> 
> # using runpath on loader
> [dmarchan@dmarchan plop]$ gcc -o loader/loader.so -Wall -Werror -shared -
> fPIC loader/loader.c -ldl -Wl,-enable-new-dtag,-rpath,lib
> [dmarchan@dmarchan plop]$ readelf -d loader/loader.so |grep R.*PATH
>  0x001d (RUNPATH)Library runpath: [lib]
> [dmarchan@dmarchan plop]$ gcc -o main -Wall -Werror main.c
> loader/loader.so -Wl,-enable-new-dtag,-rpath,loader
> [dmarchan@dmarchan plop]$ readelf -d main |grep R.*PATH
>  0x001d (RUNPATH)Library runpath: [loader]
> [dmarchan@

Re: [dpdk-dev] [EXT] Re: [PATCH] ethdev: allow multiple security sessions to use one rte flow

[Anoob Joseph]

Hi Vladimir,

Please see inline.

Thanks,
Anoob

> -Original Message-
> From: dev  On Behalf Of Medvedkin, Vladimir
> Sent: Wednesday, December 18, 2019 7:22 PM
> To: Anoob Joseph ; Ananyev, Konstantin
> ; Akhil Goyal ;
> Adrien Mazarguil ; Doherty, Declan
> ; Yigit, Ferruh ; Jerin
> Jacob Kollanukkaran ; Thomas Monjalon
> 
> Cc: Ankur Dwivedi ; Hemant Agrawal
> ; Matan Azrad ;
> Nicolau, Radu ; Shahaf Shuler
> ; Narayana Prasad Raju Athreya
> ; dev@dpdk.org
> Subject: Re: [dpdk-dev] [EXT] Re: [PATCH] ethdev: allow multiple security
> sessions to use one rte flow
> 
> Hi Anoob,
> 
> On 18/12/2019 03:54, Anoob Joseph wrote:
> > Hi Vladimir,
> >
> > Please see inline.
> >
> > Thanks,
> > Anoob
> >
> >> -Original Message-
> >> From: Medvedkin, Vladimir 
> >> Sent: Tuesday, December 17, 2019 11:14 PM
> >> To: Anoob Joseph ; Ananyev, Konstantin
> >> ; Akhil Goyal ;
> >> Adrien Mazarguil ; Doherty, Declan
> >> ; Yigit, Ferruh ;
> >> Jerin Jacob Kollanukkaran ; Thomas Monjalon
> >> 
> >> Cc: Ankur Dwivedi ; Hemant Agrawal
> >> ; Matan Azrad ;
> Nicolau,
> >> Radu ; Shahaf Shuler
> ;
> >> Narayana Prasad Raju Athreya ; dev@dpdk.org
> >> Subject: Re: [EXT] Re: [dpdk-dev] [PATCH] ethdev: allow multiple
> >> security sessions to use one rte flow
> >>
> >> Hi Anoob,
> >>
> >> On 17/12/2019 14:24, Anoob Joseph wrote:
> >>> Hi Vladimir,
> >>>
> >>> Please see inline.
> >>>
> >>> Thanks,
> >>> Anoob
> >>>
>  -Original Message-
>  From: Medvedkin, Vladimir 
>  Sent: Tuesday, December 17, 2019 4:51 PM
>  To: Anoob Joseph ; Ananyev, Konstantin
>  ; Akhil Goyal ;
>  Adrien Mazarguil ; Doherty, Declan
>  ; Yigit, Ferruh ;
>  Jerin Jacob Kollanukkaran ; Thomas Monjalon
>  
>  Cc: Ankur Dwivedi ; Hemant Agrawal
>  ; Matan Azrad ;
> >> Nicolau,
>  Radu ; Shahaf Shuler
> >> ;
>  Narayana Prasad Raju Athreya ;
> dev@dpdk.org
>  Subject: Re: [EXT] Re: [dpdk-dev] [PATCH] ethdev: allow multiple
>  security sessions to use one rte flow
> 
>  Hi Anoob,
> 
>  On 16/12/2019 16:16, Anoob Joseph wrote:
> > Hi Vladimir,
> >
> > Please see inline.
> >
> > Thanks,
> > Anoob
> >
> >> -Original Message-
> >> From: Medvedkin, Vladimir 
> >> Sent: Monday, December 16, 2019 9:29 PM
> >> To: Anoob Joseph ; Ananyev, Konstantin
> >> ; Akhil Goyal
> >> ; Adrien Mazarguil
> >> ; Doherty, Declan
> >> ; Yigit, Ferruh
> >> ; Jerin Jacob Kollanukkaran
> >> ; Thomas Monjalon 
> >> Cc: Ankur Dwivedi ; Hemant Agrawal
> >> ; Matan Azrad
> ;
>  Nicolau,
> >> Radu ; Shahaf Shuler
> >> ; Narayana Prasad Raju Athreya
> >> ; dev@dpdk.org
> >> Subject: [EXT] Re: [dpdk-dev] [PATCH] ethdev: allow multiple
> >> security sessions to use one rte flow
> >>
> >> External Email
> >>
> >> -
> >> --
> >> --
> >> -
> >> Hi Anoob,
> >>
> >> On 11/12/2019 17:33, Anoob Joseph wrote:
> >>> Hi Konstantin,
> >>>
> >>> Please see inline.
> >>>
> >>> Thanks,
> >>> Anoob
> >>>
>  -Original Message-
>  From: dev  On Behalf Of Ananyev,
> >> Konstantin
>  Sent: Wednesday, December 11, 2019 4:36 PM
>  To: Anoob Joseph ; Akhil Goyal
>  ; Adrien Mazarguil
>  ; Doherty, Declan
>  ; Yigit, Ferruh
>  ; Jerin Jacob Kollanukkaran
>  ; Thomas Monjalon
> 
>  Cc: Ankur Dwivedi ; Hemant Agrawal
>  ; Matan Azrad
> >> ;
> >> Nicolau,
>  Radu ; Shahaf Shuler
>  ; Narayana Prasad Raju Athreya
>  ; dev@dpdk.org
>  Subject: Re: [dpdk-dev] [PATCH] ethdev: allow multiple security
>  sessions to use one rte flow
> 
> 
> >>> The rte_security API which enables inline protocol/crypto
> >>> feature mandates that for every security session an rte_flow
> >>> is
> >> created.
> >>> This would internally translate to a rule in the hardware
> >>> which would do packet classification.
> >>>
> >>> In rte_securty, one SA would be one security session. And if
> >>> an rte_flow need to be created for every session, the number
> >>> of SAs supported by an inline implementation would be
> >>> limited by the number of rte_flows the PMD would be able to
> support.
> >>>
> >>> If the fields SPI & IP addresses are allowed to be a range,
> >>> then this limitation can be overcome. Multiple flows will be
> >>> able to use one rule for SECURITY processing. In this case,
> >>> the security session provided as conf would be NULL.
> >> Wonder what will be the usage model for it?
> >> AFAIK,  RFC 4301 clearly states that either SPI value alone
> >> or in conjunction with dst (and src) IP should clearly
> >>>

[dpdk-dev] [PATCH] net/ixgbe: fix flow ctrl mode setting

[Sun GuinanX]

When the port starts, the hw register is reset first,
and then the required parameters are set again.
If the parameters to be used are not set after resetting the register,
a read register error will occur. This patch is used to fix the problem.

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

Signed-off-by: Sun GuinanX 
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 20 
 drivers/net/ixgbe/ixgbe_ethdev.h |  1 +
 2 files changed, 21 insertions(+)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 2c6fd0f13..e602df02b 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -2539,6 +2539,7 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
 {
struct ixgbe_hw *hw =
IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+   struct ixgbe_adapter *adapter = dev->data->dev_private;
struct ixgbe_vf_info *vfinfo =
*IXGBE_DEV_PRIVATE_TO_P_VFDATA(dev->data->dev_private);
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
@@ -2555,6 +2556,7 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
IXGBE_DEV_PRIVATE_TO_TM_CONF(dev->data->dev_private);
struct ixgbe_macsec_setting *macsec_setting =
IXGBE_DEV_PRIVATE_TO_MACSEC_SETTING(dev->data->dev_private);
+   uint32_t mflcn;
 
PMD_INIT_FUNC_TRACE();
 
@@ -2665,6 +2667,20 @@ ixgbe_dev_start(struct rte_eth_dev *dev)
}
 
ixgbe_restore_statistics_mapping(dev);
+   err = ixgbe_fc_enable(hw);
+   if ((err == IXGBE_SUCCESS) || (err == IXGBE_ERR_FC_NOT_NEGOTIATED)) {
+
+   mflcn = IXGBE_READ_REG(hw, IXGBE_MFLCN);
+
+   /* set or clear MFLCN.PMCF bit depending on configuration */
+   if (adapter->mac_ctrl_frame_fwd != 0)
+   mflcn |= IXGBE_MFLCN_PMCF;
+   else
+   mflcn &= ~IXGBE_MFLCN_PMCF;
+
+   IXGBE_WRITE_REG(hw, IXGBE_MFLCN, mflcn);
+   IXGBE_WRITE_FLUSH(hw);
+   }
 
err = ixgbe_dev_rxtx_start(dev);
if (err < 0) {
@@ -2893,6 +2909,8 @@ ixgbe_dev_stop(struct rte_eth_dev *dev)
 
adapter->rss_reta_updated = 0;
 
+   adapter->mac_ctrl_frame_fwd = 0;
+
hw->adapter_stopped = true;
 }
 
@@ -4646,6 +4664,7 @@ static int
 ixgbe_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
 {
struct ixgbe_hw *hw;
+   struct ixgbe_adapter *adapter = dev->data->dev_private;
int err;
uint32_t rx_buf_size;
uint32_t max_high_water;
@@ -4682,6 +4701,7 @@ ixgbe_flow_ctrl_set(struct rte_eth_dev *dev, struct 
rte_eth_fc_conf *fc_conf)
hw->fc.low_water[0]   = fc_conf->low_water;
hw->fc.send_xon   = fc_conf->send_xon;
hw->fc.disable_fc_autoneg = !fc_conf->autoneg;
+   adapter->mac_ctrl_frame_fwd = fc_conf->mac_ctrl_frame_fwd;
 
err = ixgbe_fc_enable(hw);
 
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h
index 76a1b9d18..5af584f9e 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.h
+++ b/drivers/net/ixgbe/ixgbe_ethdev.h
@@ -510,6 +510,7 @@ struct ixgbe_adapter {
 * mailbox status) link status.
 */
uint8_t pflink_fullchk;
+   uint8_t mac_ctrl_frame_fwd;
 };
 
 struct ixgbe_vf_representor {
-- 
2.17.1

Re: [dpdk-dev] [PATCH 0/2] drivers/net: set fixed flag for exact link speed

[Xu, Ting]

> -Original Message-
> From: dev  On Behalf Of Guinan Sun
> Sent: Wednesday, December 4, 2019 12:59 AM
> To: dev@dpdk.org
> Cc: Lu, Wenzhuo ; Yang, Qiming
> ; Xing, Beilei ; Sun, GuinanX
> 
> Subject: [dpdk-dev] [PATCH 0/2] drivers/net: set fixed flag for exact link 
> speed
> 
> Setting exact link speed makes sense if auto-negotiation is disabled. Fixed 
> flag
> is required to disable auto-negotiation.
> 
> Guinan Sun (2):
>   net/i40e: set fixed flag for exact link speed
>   net/ixgbe: set fixed flag for exact link speed
> 
>  drivers/net/i40e/i40e_ethdev.c   | 17 +++--
>  drivers/net/ixgbe/ixgbe_ethdev.c | 20 +++-
>  2 files changed, 14 insertions(+), 23 deletions(-)
> 
> --
> 2.17.1

Reviewed-by: Ting Xu 

[dpdk-dev] [PATCH] net/iavf: fix virtual channel return value error

[Yahui Cao]

Original virtual channel return value is overwritten by _clear_cmd().

Fixes: 22b123a36d07 ("net/avf: initialize PMD")
Cc: sta...@dpdk.org

Signed-off-by: Yahui Cao 
---
 drivers/net/iavf/iavf.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h
index bbd4d75d0..b12ad4119 100644
--- a/drivers/net/iavf/iavf.h
+++ b/drivers/net/iavf/iavf.h
@@ -181,7 +181,6 @@ _clear_cmd(struct iavf_info *vf)
 {
rte_wmb();
vf->pend_cmd = VIRTCHNL_OP_UNKNOWN;
-   vf->cmd_retval = VIRTCHNL_STATUS_SUCCESS;
 }
 
 /* Check there is pending cmd in execution. If none, set new command. */
-- 
2.17.1

Re: [dpdk-dev] [PATCH v4] doc: introduce openwrt how-to guide

[Zhang, Xiao]

> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Xiaolong Ye
> Sent: Monday, December 16, 2019 11:01 AM
> To: Mcnamara, John ; Kovacevic, Marko
> 
> Cc: dev@dpdk.org; Richardson, Bruce ; Stephen
> Hemminger ; Ye, Xiaolong
> 
> Subject: [dpdk-dev] [PATCH v4] doc: introduce openwrt how-to guide
> 
> This doc describes how to enable DPDK on openwrt in both virtual and physical
> x86 environment.
> 
> Signed-off-by: Xiaolong Ye 

Acked-by: Xiao Zhang 

Re: [dpdk-dev] [PATCH v1 2/6] raw/octeontx2_ep: add device configuration

[Mahipal Challa]

Hi Gavin,
Thanks for your suggestions, please see the response inline.



From: Gavin Hu (Arm Technology China) 
Sent: Saturday, December 14, 2019 9:34 PM
To: Mahipal Challa ; dev@dpdk.org 
Cc: Jerin Jacob Kollanukkaran ; Narayana Prasad Raju 
Athreya ; Subrahmanyam Nilla ; 
Venkateshwarlu Nalla ; nd 
Subject: [EXT] RE: [dpdk-dev] [PATCH v1 2/6] raw/octeontx2_ep: add device 
configuration

External Email

--
Hi Mahipal,

> -Original Message-
> From: dev  On Behalf Of Mahipal Challa
> Sent: Friday, December 6, 2019 2:39 PM
> To: dev@dpdk.org
> Cc: jer...@marvell.com; pathr...@marvell.com; sni...@marvell.com;
> venk...@marvell.com
> Subject: [dpdk-dev] [PATCH v1 2/6] raw/octeontx2_ep: add device
> configuration
>
> Register "dev_configure" API to configure/initialize the SDP
> VF PCIe devices.
>
> Signed-off-by: Mahipal Challa 
> ---
>  doc/guides/rawdevs/octeontx2_ep.rst|  29 ++
>  drivers/common/octeontx2/hw/otx2_sdp.h | 184 +
>  drivers/common/octeontx2/otx2_common.c |   9 +
>  drivers/common/octeontx2/otx2_common.h |   4 +
>  .../octeontx2/rte_common_octeontx2_version.map |   6 +
>  drivers/raw/octeontx2_ep/Makefile  |   3 +
>  drivers/raw/octeontx2_ep/meson.build   |   4 +-
>  drivers/raw/octeontx2_ep/otx2_ep_enqdeq.c  | 294 ++
>  drivers/raw/octeontx2_ep/otx2_ep_enqdeq.h  |  11 +
>  drivers/raw/octeontx2_ep/otx2_ep_rawdev.c  | 148 +++
>  drivers/raw/octeontx2_ep/otx2_ep_rawdev.h  | 434
> -
>  drivers/raw/octeontx2_ep/otx2_ep_vf.c  | 408 +++
>  drivers/raw/octeontx2_ep/otx2_ep_vf.h  |  10 +
>  13 files changed, 1542 insertions(+), 2 deletions(-)
>
> diff --git a/doc/guides/rawdevs/octeontx2_ep.rst
> b/doc/guides/rawdevs/octeontx2_ep.rst
> index 5f5ed01..2507fcf 100644
> --- a/doc/guides/rawdevs/octeontx2_ep.rst
> +++ b/doc/guides/rawdevs/octeontx2_ep.rst
> @@ -39,3 +39,32 @@ entry `sriov_numvfs` for the corresponding PF driver.
>
>  Once the required VFs are enabled, to be accessible from DPDK, VFs need to
> be
>  bound to vfio-pci driver.
> +
> +Device Setup
> +
> +
> +The OCTEON TX2 SDP End Point VF devices will need to be bound to a
> +user-space IO driver for use. The script ``dpdk-devbind.py`` script
> +included with DPDK can be used to view the state of the devices and to bind
> +them to a suitable DPDK-supported kernel driver. When querying the status
> +of the devices, they will appear under the category of "Misc (rawdev)
> +devices", i.e. the command ``dpdk-devbind.py --status-dev misc`` can be
> +used to see the state of those devices alone.
> +
> +Device Configuration
> +
> +
> +Configuring SDP EP rawdev device is done using the
> ``rte_rawdev_configure()``
> +API, which takes the mempool as parameter. PMD uses this pool to
> send/receive
> +packets to/from the HW.
> +
> +The following code shows how the device is configured
> +
> +.. code-block:: c
> +
> +   struct sdp_rawdev_info config = {0};
> +   struct rte_rawdev_info rdev_info = {.dev_private = &config};
> +   config.enqdeq_mpool = (void *)rte_mempool_create(...);
> +
> +   rte_rawdev_configure(dev_id, (rte_rawdev_obj_t)&rdev_info);
> +
> diff --git a/drivers/common/octeontx2/hw/otx2_sdp.h
> b/drivers/common/octeontx2/hw/otx2_sdp.h
> new file mode 100644
> index 000..7e03317
> --- /dev/null
> +++ b/drivers/common/octeontx2/hw/otx2_sdp.h
> @@ -0,0 +1,184 @@
> +/* SPDX-License-Identifier: BSD-3-Clause
> + * Copyright(C) 2019 Marvell International Ltd.
> + */
> +
> +#ifndef __OTX2_SDP_HW_H_
> +#define __OTX2_SDP_HW_H_
> +
> +/* SDP VF IOQs */
> +#define SDP_MIN_RINGS_PER_VF(1)
> +#define SDP_MAX_RINGS_PER_VF(8)
> +
> +/* SDP VF IQ configuration */
> +#define SDP_VF_MAX_IQ_DESCRIPTORS   (512)
> +#define SDP_VF_MIN_IQ_DESCRIPTORS   (128)
> +
> +#define SDP_VF_DB_MIN   (1)
> +#define SDP_VF_DB_TIMEOUT   (1)
> +#define SDP_VF_INTR_THRESHOLD   (0x)
> +
> +#define SDP_VF_64BYTE_INSTR (64)
> +#define SDP_VF_32BYTE_INSTR (32)
> +
> +/* SDP VF OQ configuration */
> +#define SDP_VF_MAX_OQ_DESCRIPTORS   (512)
> +#define SDP_VF_MIN_OQ_DESCRIPTORS   (128)
> +#define SDP_VF_OQ_BUF_SIZE  (2048)
> +#define SDP_VF_OQ_REFIL_THRESHOLD   (16)
> +
> +#define SDP_VF_OQ_INFOPTR_MODE  (1)
> +#define SDP_VF_OQ_BUFPTR_MODE   (0)
> +
> +#define SDP_VF_OQ_INTR_PKT  (1)
> +#define SDP_VF_OQ_INTR_TIME (10)
> +#define SDP_VF_CFG_IO_QUEUESSDP_MAX_RINGS_PER_VF
> +
> +/* Wait time in milliseconds for FLR */
> +#define SDP_VF_PCI_FLR_WAIT (100)
> +#define SDP_VF_BUSY_LOOP_COUNT  (1)
> +
> +#define SDP_VF_MAX_IO_QUEUESSDP_MAX_RINGS_PER_VF
> +#define SDP_VF_MIN_IO_QUEUESSDP_MIN_RINGS_PER_VF
> +
> +/* SDP

Re: [dpdk-dev] [PATCH v1 5/6] raw/octeontx2_ep: add dequeue operation

[Mahipal Challa]

Hi Gavin,
Please see response inline.


From: Gavin Hu (Arm Technology China) 
Sent: Saturday, December 14, 2019 9:48 PM
To: Mahipal Challa ; dev@dpdk.org 
Cc: Jerin Jacob Kollanukkaran ; Narayana Prasad Raju 
Athreya ; Subrahmanyam Nilla ; 
Venkateshwarlu Nalla ; nd 
Subject: [EXT] RE: [dpdk-dev] [PATCH v1 5/6] raw/octeontx2_ep: add dequeue 
operation

External Email

--
Hi Mahipal,

> -Original Message-
> From: dev  On Behalf Of Mahipal Challa
> Sent: Friday, December 6, 2019 2:39 PM
> To: dev@dpdk.org
> Cc: jer...@marvell.com; pathr...@marvell.com; sni...@marvell.com;
> venk...@marvell.com
> Subject: [dpdk-dev] [PATCH v1 5/6] raw/octeontx2_ep: add dequeue
> operation
>
> Add rawdev dequeue operation for SDP VF devices.
>
> Signed-off-by: Mahipal Challa 
> ---
>  drivers/raw/octeontx2_ep/otx2_ep_enqdeq.c | 199
> ++
>  drivers/raw/octeontx2_ep/otx2_ep_enqdeq.h |   2 +
>  drivers/raw/octeontx2_ep/otx2_ep_rawdev.c |   1 +
>  drivers/raw/octeontx2_ep/otx2_ep_rawdev.h |  18 ++-
>  4 files changed, 219 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/raw/octeontx2_ep/otx2_ep_enqdeq.c
> b/drivers/raw/octeontx2_ep/otx2_ep_enqdeq.c
> index ebbacfb..451fcc0 100644
> --- a/drivers/raw/octeontx2_ep/otx2_ep_enqdeq.c
> +++ b/drivers/raw/octeontx2_ep/otx2_ep_enqdeq.c
> @@ -260,6 +260,7 @@
>rte_mempool_get(sdpvf->enqdeq_mpool, &buf);
>if (buf == NULL) {
>otx2_err("OQ buffer alloc failed");
> + droq->stats.rx_alloc_failure++;
>/* sdp_droq_destroy_ring_buffers(droq);*/
>return -ENOMEM;
>}
> @@ -645,3 +646,201 @@
>return SDP_IQ_SEND_FAILED;
>  }
>
> +static uint32_t
> +sdp_droq_refill(struct sdp_device *sdpvf, struct sdp_droq *droq)
> +{
> + struct sdp_droq_desc *desc_ring;
> + uint32_t desc_refilled = 0;
> + void *buf = NULL;
> +
> + desc_ring = droq->desc_ring;
> +
> + while (droq->refill_count && (desc_refilled < droq->nb_desc)) {
> + /* If a valid buffer exists (happens if there is no dispatch),
> +  * reuse the buffer, else allocate.
> +  */
> + if (droq->recv_buf_list[droq->refill_idx].buffer != NULL)
> + break;
> +
> + rte_mempool_get(sdpvf->enqdeq_mpool, &buf);
> + /* If a buffer could not be allocated, no point in
> +  * continuing
> +  */
> + if (buf == NULL) {
> + droq->stats.rx_alloc_failure++;
> + break;
> + }
> +
> + droq->recv_buf_list[droq->refill_idx].buffer = buf;
> + desc_ring[droq->refill_idx].buffer_ptr =
> rte_mem_virt2iova(buf);
> +
> + /* Reset any previous values in the length field. */
> + droq->info_list[droq->refill_idx].length = 0;
> +
> + droq->refill_idx = sdp_incr_index(droq->refill_idx, 1,
> + droq->nb_desc);
> +
> + desc_refilled++;
> + droq->refill_count--;
> +
> + }
> +
> + return desc_refilled;
> +}
> +
> +static int
> +sdp_droq_read_packet(struct sdp_device *sdpvf __rte_unused,
> +  struct sdp_droq *droq,
> +  struct sdp_droq_pkt *droq_pkt)
> +{
> + struct sdp_droq_info *info;
> + uint32_t total_len = 0;
> + uint32_t pkt_len = 0;
> +
> + info = &droq->info_list[droq->read_idx];
> + sdp_swap_8B_data((uint64_t *)&info->length, 1);
> + if (!info->length) {
> + otx2_err("OQ info_list->length[%ld]", (long)info->length);
> + goto oq_read_fail;
> + }
> +
> + /* Deduce the actual data size */
> + info->length -= SDP_RH_SIZE;
> + total_len += (uint32_t)info->length;
> +
> + otx2_sdp_dbg("OQ: pkt_len[%ld], buffer_size %d",
> + (long)info->length, droq->buffer_size);
> + if (info->length > droq->buffer_size) {
> + otx2_err("This mode is not supported: pkt_len > buffer_size");
> + goto oq_read_fail;
> + }
> +
> + if (info->length <= droq->buffer_size) {
> + pkt_len = (uint32_t)info->length;
> + droq_pkt->data = droq->recv_buf_list[droq->read_idx].buffer;
> + droq_pkt->len  = pkt_len;
> +
> + droq->recv_buf_list[droq->read_idx].buffer = NULL;
> + droq->read_idx = sdp_incr_index(droq->read_idx, 1,/*
> count */
> + droq->nb_desc /* max rd idx
> */);
> + droq->refill_count++;
> +
> + }
> +
> + info->length = 0;
> +
> + return SDP_OQ_RECV_SUCCESS;
> +
> +oq_read_fail:
> + return SDP_OQ_RECV_FAILED;
> +}
> +
> +static inline uint32_t
> +sdp_check_droq_pkts(struct sdp_droq *droq, uint32_t burst_size)
> +{
> + uint32_t mi

Re: [dpdk-dev] [PATCH v1 4/6] raw/octeontx2_ep: add enqueue operation

[Mahipal Challa]

Hi Gavin,
Please see the response inline.


From: Gavin Hu (Arm Technology China) 
Sent: Saturday, December 14, 2019 9:54 PM
To: Mahipal Challa ; dev@dpdk.org 
Cc: Jerin Jacob Kollanukkaran ; Narayana Prasad Raju 
Athreya ; Subrahmanyam Nilla ; 
Venkateshwarlu Nalla ; nd 
Subject: [EXT] RE: [dpdk-dev] [PATCH v1 4/6] raw/octeontx2_ep: add enqueue 
operation

External Email

--
Hi Mahipal,

> -Original Message-
> From: dev  On Behalf Of Mahipal Challa
> Sent: Friday, December 6, 2019 2:39 PM
> To: dev@dpdk.org
> Cc: jer...@marvell.com; pathr...@marvell.com; sni...@marvell.com;
> venk...@marvell.com
> Subject: [dpdk-dev] [PATCH v1 4/6] raw/octeontx2_ep: add enqueue
> operation
>
> Add rawdev enqueue operation for SDP VF devices.
>
> Signed-off-by: Mahipal Challa 
> ---
>  doc/guides/rawdevs/octeontx2_ep.rst   |   6 +
>  drivers/raw/octeontx2_ep/otx2_ep_enqdeq.c | 242
> ++
>  drivers/raw/octeontx2_ep/otx2_ep_enqdeq.h |  39 +
>  drivers/raw/octeontx2_ep/otx2_ep_rawdev.c |   1 +
>  drivers/raw/octeontx2_ep/otx2_ep_rawdev.h |  20 +++
>  drivers/raw/octeontx2_ep/otx2_ep_vf.c |  24 +++
>  6 files changed, 332 insertions(+)
>
> diff --git a/doc/guides/rawdevs/octeontx2_ep.rst
> b/doc/guides/rawdevs/octeontx2_ep.rst
> index 2507fcf..39a7c29 100644
> --- a/doc/guides/rawdevs/octeontx2_ep.rst
> +++ b/doc/guides/rawdevs/octeontx2_ep.rst
> @@ -68,3 +68,9 @@ The following code shows how the device is configured
>
> rte_rawdev_configure(dev_id, (rte_rawdev_obj_t)&rdev_info);
>
> +Performing Data Transfer
> +
> +
> +To perform data transfer using SDP VF EP rawdev devices use standard
> +``rte_rawdev_enqueue_buffers()`` and ``rte_rawdev_dequeue_buffers()``
> APIs.
> +
> diff --git a/drivers/raw/octeontx2_ep/otx2_ep_enqdeq.c
> b/drivers/raw/octeontx2_ep/otx2_ep_enqdeq.c
> index 584b818..ebbacfb 100644
> --- a/drivers/raw/octeontx2_ep/otx2_ep_enqdeq.c
> +++ b/drivers/raw/octeontx2_ep/otx2_ep_enqdeq.c
> @@ -403,3 +403,245 @@
>return -ENOMEM;
>  }
>
> +static inline void
> +sdp_iqreq_delete(struct sdp_device *sdpvf,
> + struct sdp_instr_queue *iq, uint32_t idx)
> +{
> + uint32_t reqtype;
> + void *buf;
> +
> + buf = iq->req_list[idx].buf;
> + reqtype = iq->req_list[idx].reqtype;
> +
> + switch (reqtype) {
> + case SDP_REQTYPE_NORESP:
> + rte_mempool_put(sdpvf->enqdeq_mpool, buf);
> + otx2_sdp_dbg("IQ buffer freed at idx[%d]", idx);
> + break;
> +
> + case SDP_REQTYPE_NORESP_GATHER:
> + case SDP_REQTYPE_NONE:
> + default:
> + otx2_info("This iqreq mode is not supported:%d", reqtype);
> +
> + }
> +
> + /* Reset the request list at this index */
> + iq->req_list[idx].buf = NULL;
> + iq->req_list[idx].reqtype = 0;
> +}
> +
> +static inline void
> +sdp_iqreq_add(struct sdp_instr_queue *iq, void *buf,
> + uint32_t reqtype)
> +{
> + iq->req_list[iq->host_write_index].buf = buf;
> + iq->req_list[iq->host_write_index].reqtype = reqtype;
> +
> + otx2_sdp_dbg("IQ buffer added at idx[%d]", iq->host_write_index);
> +
> +}
> +
> +static void
> +sdp_flush_iq(struct sdp_device *sdpvf,
> + struct sdp_instr_queue *iq,
> + uint32_t pending_thresh __rte_unused)
> +{
> + uint32_t instr_processed = 0;
> +
> + rte_spinlock_lock(&iq->lock);
> +
> + iq->otx_read_index = sdpvf->fn_list.update_iq_read_idx(iq);
> + while (iq->flush_index != iq->otx_read_index) {
> + /* Free the IQ data buffer to the pool */
> + sdp_iqreq_delete(sdpvf, iq, iq->flush_index);
> + iq->flush_index =
> + sdp_incr_index(iq->flush_index, 1, iq->nb_desc);
> +
> + instr_processed++;
> + }
> +
> + iq->stats.instr_processed = instr_processed;
> + rte_atomic64_sub(&iq->instr_pending, instr_processed);
> +
> + rte_spinlock_unlock(&iq->lock);
> +}
> +
> +static inline void
> +sdp_ring_doorbell(struct sdp_device *sdpvf __rte_unused,
> + struct sdp_instr_queue *iq)
> +{
> + otx2_write64(iq->fill_cnt, iq->doorbell_reg);
> +
> + /* Make sure doorbell write goes through */
> + rte_wmb();
This is overkill, no need to wait for the completeness, is it ok to just ensure 
the doorbell ring is seen by the device before the new fill_cnt is seen by 
lcore? If yes, therefore rte_cio_wmb is sufficient.
[Mahipal]: Yes, this is to ensure the doorbell ring write completion, will 
replace it with rte_cio_wmb().
> + iq->fill_cnt = 0;
> +
> +}
> +
> +static inline int
> +post_iqcmd(struct sdp_instr_queue *iq, uint8_t *iqcmd)
> +{
> + uint8_t *iqptr, cmdsize;
> +
> + /* This ensures that the read index does not wrap around to
> +  * the same position if queue gets full before OCTEON TX2 could
> +  * fetch any instr.
> +  *