Re: [dpdk-dev] aligned commit logs

[Ivan Malov]

Hi Thomas,

I must confess that such compactness is somewhat distinct, and it might 
look pretty strange.
But please rest assured that it does not stand for some really special 
thing.


So, this occasional finding can be taken with a grain of salt.

Ivan

On 29.06.2019 22:49, Thomas Monjalon wrote:

Hi Ivan,

I'm curious about the alignment of your commit logs.
How do you manage to fit in such a beautiful alignment?
Is it a challenge to win something? :)

References:
http://dpdk.org/commit/42319ff3e0
http://dpdk.org/commit/64efa6f85d
http://dpdk.org/commit/f5f93e106e
http://dpdk.org/commit/86dbbc5dbb
http://dpdk.org/commit/b65eb10c4d
http://dpdk.org/commit/d1482e21f0
http://dpdk.org/commit/5e23c24988
http://dpdk.org/commit/7a1ab3f8db
http://dpdk.org/commit/b22e77c026
http://dpdk.org/commit/7106c99cb8
http://dpdk.org/commit/c78d280e88
http://dpdk.org/commit/85069adea7
http://dpdk.org/commit/cd8da5e83d
http://dpdk.org/commit/7482984419
http://dpdk.org/commit/b8afc069fa
http://dpdk.org/commit/642088ddff
http://dpdk.org/commit/d112a3ecb7
http://dpdk.org/commit/3b257f7e6c
http://dpdk.org/commit/4650ed44c1
http://dpdk.org/commit/f5258439ee
http://dpdk.org/commit/178fc0d327
http://dpdk.org/commit/e56fa9c23e
http://dpdk.org/commit/e9ddf37a50

[dpdk-dev] [PATCH v8 0/3] add actions to modify header fields

[Dekel Peled]

Patch [1] implemented set of header modification actions in MLX PMD,
based on ethdev and testpmd updates included in [2].
This series implements support of additional header modification
actions, in ethdev, testpmd, and MLX5 PMD.

Original work by Xiaoyu Min.

[1] http://patches.dpdk.org/patch/49310/
[2] http://mails.dpdk.org/archives/dev/2018-August/109672.html

---
v2: apply code review comments.
v3: apply additional code review comments.
- Update documentation of new commands.
- Use common general struct for all commands.
v4: apply checkpatch comments.
v5: apply additional code review comments.
- Add 8, 16, 32 bit types to union.
- Update struct name and documentation.
v6: expand description of new struct in h file and commit log.
v7: - Remove the common general struct with union added in v3 & v5.
- Commands take a simple integer value, not enclosed in a structure.
- Use separate commands for INC and DEC to allow full use of
  the 32 bit value as unsigned.
v8: clean redundant comments refering to removed structure.  
---
  
Dekel Peled (3):
  ethdev: add actions to modify TCP header fields
  app/testpmd: add actions to modify TCP header fields
  net/mlx5: update modify header using Direct Verbs

 app/test-pmd/cmdline_flow.c | 100 
 doc/guides/prog_guide/rte_flow.rst  |  35 +++-
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  16 ++
 drivers/net/mlx5/mlx5_flow.h|  10 +-
 drivers/net/mlx5/mlx5_flow_dv.c | 237 
 drivers/net/mlx5/mlx5_prm.h |  12 ++
 lib/librte_ethdev/rte_flow.c|   4 +
 lib/librte_ethdev/rte_flow.h|  34 +++-
 8 files changed, 445 insertions(+), 3 deletions(-)

-- 
1.8.3.1

[dpdk-dev] [PATCH v8 3/3] net/mlx5: update modify header using Direct Verbs

[Dekel Peled]

This patch implements additional actions of packet header
modifications.

Add actions:
- INC_TCP_SEQ - Increase sequence number in the outermost TCP header.
- DEC_TCP_SEQ - Decrease sequence number in the outermost TCP header.
- INC_TCP_ACK - Increase acknowledgment number in the outermost TCP
header.
- DEC_TCP_ACK - Decrease acknowledgment number in the outermost TCP
header.

Original work by Xiaoyu Min.

Signed-off-by: Dekel Peled 
---
 drivers/net/mlx5/mlx5_flow.h|  10 +-
 drivers/net/mlx5/mlx5_flow_dv.c | 237 
 drivers/net/mlx5/mlx5_prm.h |  12 ++
 3 files changed, 258 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index b665420..dc4a56a 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -114,6 +114,10 @@
 #define MLX5_FLOW_ACTION_NVGRE_DECAP (1u << 25)
 #define MLX5_FLOW_ACTION_RAW_ENCAP (1u << 26)
 #define MLX5_FLOW_ACTION_RAW_DECAP (1u << 27)
+#define MLX5_FLOW_ACTION_INC_TCP_SEQ (1u << 28)
+#define MLX5_FLOW_ACTION_DEC_TCP_SEQ (1u << 29)
+#define MLX5_FLOW_ACTION_INC_TCP_ACK (1u << 30)
+#define MLX5_FLOW_ACTION_DEC_TCP_ACK (1u << 31)
 
 #define MLX5_FLOW_FATE_ACTIONS \
(MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | \
@@ -140,7 +144,11 @@
  MLX5_FLOW_ACTION_SET_TTL | \
  MLX5_FLOW_ACTION_DEC_TTL | \
  MLX5_FLOW_ACTION_SET_MAC_SRC | \
- MLX5_FLOW_ACTION_SET_MAC_DST)
+ MLX5_FLOW_ACTION_SET_MAC_DST | \
+ MLX5_FLOW_ACTION_INC_TCP_SEQ | \
+ MLX5_FLOW_ACTION_DEC_TCP_SEQ | \
+ MLX5_FLOW_ACTION_INC_TCP_ACK | \
+ MLX5_FLOW_ACTION_DEC_TCP_ACK)
 
 #ifndef IPPROTO_MPLS
 #define IPPROTO_MPLS 137
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 933ad0b..8f64182 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -136,6 +136,8 @@ struct field_modify_info modify_udp[] = {
 struct field_modify_info modify_tcp[] = {
{2, 0, MLX5_MODI_OUT_TCP_SPORT},
{2, 2, MLX5_MODI_OUT_TCP_DPORT},
+   {4, 4, MLX5_MODI_OUT_TCP_SEQ_NUM},
+   {4, 8, MLX5_MODI_OUT_TCP_ACK_NUM},
{0, 0, 0},
 };
 
@@ -561,6 +563,96 @@ struct field_modify_info modify_tcp[] = {
 }
 
 /**
+ * Convert modify-header increment/decrement TCP Sequence number
+ * to DV specification.
+ *
+ * @param[in,out] resource
+ *   Pointer to the modify-header resource.
+ * @param[in] action
+ *   Pointer to action specification.
+ * @param[out] error
+ *   Pointer to the error structure.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+flow_dv_convert_action_modify_tcp_seq
+   (struct mlx5_flow_dv_modify_hdr_resource *resource,
+const struct rte_flow_action *action,
+struct rte_flow_error *error)
+{
+   const rte_be32_t *conf = (const rte_be32_t *)(action->conf);
+   uint64_t value = rte_be_to_cpu_32(*conf);
+   struct rte_flow_item item;
+   struct rte_flow_item_tcp tcp;
+   struct rte_flow_item_tcp tcp_mask;
+
+   memset(&tcp, 0, sizeof(tcp));
+   memset(&tcp_mask, 0, sizeof(tcp_mask));
+   if (action->type == RTE_FLOW_ACTION_TYPE_DEC_TCP_SEQ)
+   /*
+* The HW has no decrement operation, only increment operation.
+* To simulate decrement X from Y using increment operation
+* we need to add UINT32_MAX X times to Y.
+* Each adding of UINT32_MAX decrements Y by 1.
+*/
+   value *= UINT32_MAX;
+   tcp.hdr.sent_seq = rte_cpu_to_be_32((uint32_t)value);
+   tcp_mask.hdr.sent_seq = RTE_BE32(UINT32_MAX);
+   item.type = RTE_FLOW_ITEM_TYPE_TCP;
+   item.spec = &tcp;
+   item.mask = &tcp_mask;
+   return flow_dv_convert_modify_action(&item, modify_tcp, resource,
+MLX5_MODIFICATION_TYPE_ADD, error);
+}
+
+/**
+ * Convert modify-header increment/decrement TCP Acknowledgment number
+ * to DV specification.
+ *
+ * @param[in,out] resource
+ *   Pointer to the modify-header resource.
+ * @param[in] action
+ *   Pointer to action specification.
+ * @param[out] error
+ *   Pointer to the error structure.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+flow_dv_convert_action_modify_tcp_ack
+   (struct mlx5_flow_dv_modify_hdr_resource *resource,
+const struct rte_flow_action *action,
+struct rte_flow_error *error)
+{
+   const rte_be32_t *conf = (

[dpdk-dev] [PATCH v8 2/3] app/testpmd: add actions to modify TCP header fields

[Dekel Peled]

Add actions:
- INC_TCP_SEQ - Increase sequence number in the outermost TCP header.
- DEC_TCP_SEQ - Decrease sequence number in the outermost TCP header.
- INC_TCP_ACK - Increase acknowledgment number in the outermost TCP
header.
- DEC_TCP_ACK - Decrease acknowledgment number in the outermost TCP
header.

Original work by Xiaoyu Min.

This patch introduces a new macro ARG_ENTRY_HTON, to allow using
a single argument, not enclosed in a structure.

Signed-off-by: Dekel Peled 
---
 app/test-pmd/cmdline_flow.c | 100 
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  16 +
 2 files changed, 116 insertions(+)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 201bd9d..e644efa 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -272,6 +272,14 @@ enum index {
ACTION_SET_MAC_SRC_MAC_SRC,
ACTION_SET_MAC_DST,
ACTION_SET_MAC_DST_MAC_DST,
+   ACTION_INC_TCP_SEQ,
+   ACTION_INC_TCP_SEQ_VALUE,
+   ACTION_DEC_TCP_SEQ,
+   ACTION_DEC_TCP_SEQ_VALUE,
+   ACTION_INC_TCP_ACK,
+   ACTION_INC_TCP_ACK_VALUE,
+   ACTION_DEC_TCP_ACK,
+   ACTION_DEC_TCP_ACK_VALUE,
 };
 
 /** Maximum size for pattern in struct rte_flow_item_raw. */
@@ -485,6 +493,14 @@ struct token {
.size = sizeof(((s *)0)->f), \
})
 
+/** Same as ARGS_ENTRY_HTON() for a single argument, without structure. */
+#define ARG_ENTRY_HTON(s) \
+   (&(const struct arg){ \
+   .hton = 1, \
+   .offset = 0, \
+   .size = sizeof(s), \
+   })
+
 /** Parser output buffer layout expected by cmd_flow_parsed(). */
 struct buffer {
enum index command; /**< Flow command. */
@@ -885,6 +901,10 @@ struct parse_action_priv {
ACTION_SET_TTL,
ACTION_SET_MAC_SRC,
ACTION_SET_MAC_DST,
+   ACTION_INC_TCP_SEQ,
+   ACTION_DEC_TCP_SEQ,
+   ACTION_INC_TCP_ACK,
+   ACTION_DEC_TCP_ACK,
ZERO,
 };
 
@@ -1047,6 +1067,30 @@ struct parse_action_priv {
ZERO,
 };
 
+static const enum index action_inc_tcp_seq[] = {
+   ACTION_INC_TCP_SEQ_VALUE,
+   ACTION_NEXT,
+   ZERO,
+};
+
+static const enum index action_dec_tcp_seq[] = {
+   ACTION_DEC_TCP_SEQ_VALUE,
+   ACTION_NEXT,
+   ZERO,
+};
+
+static const enum index action_inc_tcp_ack[] = {
+   ACTION_INC_TCP_ACK_VALUE,
+   ACTION_NEXT,
+   ZERO,
+};
+
+static const enum index action_dec_tcp_ack[] = {
+   ACTION_DEC_TCP_ACK_VALUE,
+   ACTION_NEXT,
+   ZERO,
+};
+
 static int parse_init(struct context *, const struct token *,
  const char *, unsigned int,
  void *, unsigned int);
@@ -2854,6 +2898,62 @@ static int comp_vc_action_rss_queue(struct context *, 
const struct token *,
 (struct rte_flow_action_set_mac, mac_addr)),
.call = parse_vc_conf,
},
+   [ACTION_INC_TCP_SEQ] = {
+   .name = "inc_tcp_seq",
+   .help = "increase TCP sequence number",
+   .priv = PRIV_ACTION(INC_TCP_SEQ, sizeof(rte_be32_t)),
+   .next = NEXT(action_inc_tcp_seq),
+   .call = parse_vc,
+   },
+   [ACTION_INC_TCP_SEQ_VALUE] = {
+   .name = "value",
+   .help = "the value to increase TCP sequence number by",
+   .next = NEXT(action_inc_tcp_seq, NEXT_ENTRY(UNSIGNED)),
+   .args = ARGS(ARG_ENTRY_HTON(rte_be32_t)),
+   .call = parse_vc_conf,
+   },
+   [ACTION_DEC_TCP_SEQ] = {
+   .name = "dec_tcp_seq",
+   .help = "decrease TCP sequence number",
+   .priv = PRIV_ACTION(DEC_TCP_SEQ, sizeof(rte_be32_t)),
+   .next = NEXT(action_dec_tcp_seq),
+   .call = parse_vc,
+   },
+   [ACTION_DEC_TCP_SEQ_VALUE] = {
+   .name = "value",
+   .help = "the value to decrease TCP sequence number by",
+   .next = NEXT(action_dec_tcp_seq, NEXT_ENTRY(UNSIGNED)),
+   .args = ARGS(ARG_ENTRY_HTON(rte_be32_t)),
+   .call = parse_vc_conf,
+   },
+   [ACTION_INC_TCP_ACK] = {
+   .name = "inc_tcp_ack",
+   .help = "increase TCP acknowledgment number",
+   .priv = PRIV_ACTION(INC_TCP_ACK, sizeof(rte_be32_t)),
+   .next = NEXT(action_inc_tcp_ack),
+   .call = parse_vc,
+   },
+   [ACTION_INC_TCP_ACK_VALUE] = {
+   .name = "value",
+   .help = "the value to increase TCP acknowledgment number by",
+   .next = NEXT(action_inc_tcp_ack, NEXT_ENTRY(UNSIGNED)),
+   .args = ARGS(ARG_ENTRY_HTON(rte_be32_t)),
+   .call = parse_vc_conf,
+   },
+   [ACTION_DEC_TCP_ACK] = {
+   .name = "dec_tcp_ack",
+   .help = "decrease TCP acknowledgment number",
+ 

[dpdk-dev] [PATCH v8 1/3] ethdev: add actions to modify TCP header fields

[Dekel Peled]

Add actions:
- INC_TCP_SEQ - Increase sequence number in the outermost TCP header.
- DEC_TCP_SEQ - Decrease sequence number in the outermost TCP header.
- INC_TCP_ACK - Increase acknowledgment number in the outermost TCP
header.
- DEC_TCP_ACK - Decrease acknowledgment number in the outermost TCP
header.

Original work by Xiaoyu Min.

This patch introduces a new approach, using a simple integer instead
of using an action-specific structure for each of these actions.
This approach can be later applied to modify existing actions which
require only a single integer.

Signed-off-by: Dekel Peled 
Acked-by: Andrew Rybchenko 
---
 doc/guides/prog_guide/rte_flow.rst | 35 ++-
 lib/librte_ethdev/rte_flow.c   |  4 
 lib/librte_ethdev/rte_flow.h   | 34 +-
 3 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/doc/guides/prog_guide/rte_flow.rst 
b/doc/guides/prog_guide/rte_flow.rst
index a34d012..783a904 100644
--- a/doc/guides/prog_guide/rte_flow.rst
+++ b/doc/guides/prog_guide/rte_flow.rst
@@ -1214,7 +1214,8 @@ Actions
 ~~~
 
 Each possible action is represented by a type. Some have associated
-configuration structures. Several actions combined in a list can be assigned
+configuration structures, some others use a simple integer.
+Several actions combined in a list can be assigned
 to a flow rule and are performed in order.
 
 They fall in three categories:
@@ -2345,6 +2346,38 @@ Otherwise, RTE_FLOW_ERROR_TYPE_ACTION error will be 
returned.
| ``mac_addr`` | MAC address   |
+--+---+
 
+Action: ``INC_TCP_SEQ``
+^^^
+
+Increase sequence number in the outermost TCP header.
+Value to increase TCP sequence number by is a big-endian 32 bit integer.
+
+Using this action on non-matching traffic will result in undefined behavior.
+
+Action: ``DEC_TCP_SEQ``
+^^^
+
+Decrease sequence number in the outermost TCP header.
+Value to decrease TCP sequence number by is a big-endian 32 bit integer.
+
+Using this action on non-matching traffic will result in undefined behavior.
+
+Action: ``INC_TCP_ACK``
+^^^
+
+Increase acknowledgment number in the outermost TCP header.
+Value to increase TCP acknowledgment number by is a big-endian 32 bit integer.
+
+Using this action on non-matching traffic will result in undefined behavior.
+
+Action: ``DEC_TCP_ACK``
+^^^
+
+Decrease acknowledgment number in the outermost TCP header.
+Value to decrease TCP acknowledgment number by is a big-endian 32 bit integer.
+
+Using this action on non-matching traffic will result in undefined behavior.
+
 Negative types
 ~~
 
diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c
index 3277be1..0c9f6c6 100644
--- a/lib/librte_ethdev/rte_flow.c
+++ b/lib/librte_ethdev/rte_flow.c
@@ -143,6 +143,10 @@ struct rte_flow_desc_data {
MK_FLOW_ACTION(SET_TTL, sizeof(struct rte_flow_action_set_ttl)),
MK_FLOW_ACTION(SET_MAC_SRC, sizeof(struct rte_flow_action_set_mac)),
MK_FLOW_ACTION(SET_MAC_DST, sizeof(struct rte_flow_action_set_mac)),
+   MK_FLOW_ACTION(INC_TCP_SEQ, sizeof(rte_be32_t)),
+   MK_FLOW_ACTION(DEC_TCP_SEQ, sizeof(rte_be32_t)),
+   MK_FLOW_ACTION(INC_TCP_ACK, sizeof(rte_be32_t)),
+   MK_FLOW_ACTION(DEC_TCP_ACK, sizeof(rte_be32_t)),
 };
 
 static int
diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h
index f3a8fb1..f5db6b6 100644
--- a/lib/librte_ethdev/rte_flow.h
+++ b/lib/librte_ethdev/rte_flow.h
@@ -1650,6 +1650,38 @@ enum rte_flow_action_type {
 * See struct rte_flow_action_set_mac.
 */
RTE_FLOW_ACTION_TYPE_SET_MAC_DST,
+
+   /**
+* Increase sequence number in the outermost TCP header.
+*
+* Using this action on non-matching traffic will result in
+* undefined behavior.
+*/
+   RTE_FLOW_ACTION_TYPE_INC_TCP_SEQ,
+
+   /**
+* Decrease sequence number in the outermost TCP header.
+*
+* Using this action on non-matching traffic will result in
+* undefined behavior.
+*/
+   RTE_FLOW_ACTION_TYPE_DEC_TCP_SEQ,
+
+   /**
+* Increase acknowledgment number in the outermost TCP header.
+*
+* Using this action on non-matching traffic will result in
+* undefined behavior.
+*/
+   RTE_FLOW_ACTION_TYPE_INC_TCP_ACK,
+
+   /**
+* Decrease acknowledgment number in the outermost TCP header.
+*
+* Using this action on non-matching traffic will result in
+* undefined behavior.
+*/
+   RTE_FLOW_ACTION_TYPE_DEC_TCP_ACK,
 };
 
 /**
@@ -2140,7 +2172,7 @@ struct rte_flow_action_set_mac {
  */
 struct rte_flow_action {
enum rte_flow_action_type type; /**< Action type. */
-   const void *conf; /**< Pointer to action configuration structure. *

Re: [dpdk-dev] [PATCH] cryptodev: extend api of asymmetric crypto by sessionless

[Shally Verma]

> -Original Message-
> From: Trahe, Fiona 
> Sent: Friday, June 28, 2019 10:58 PM
> To: Shally Verma ; Akhil Goyal ;
> Kusztal, ArkadiuszX ; dev@dpdk.org
> Cc: Trahe, Fiona 
> Subject: [EXT] RE: [PATCH] cryptodev: extend api of asymmetric crypto by
> sessionless
> 
> External Email
> 
> --
> Hi Shally,


> > >
> >
> > [Shally]  I would favor to have feature flag instead, to keep it simple.
> > We're relying too much on documentation here. Any op status, be it
> > INVALID_OP_SESSION, or NOT_SUPPORTED does not give clear reason for
> > failure. Assuming we agree on feature flag, then next question comes
> > if PMD set SESSIONLESS feature flag, then does that mean it support
> > *only* sessionless OR both "session" and "sessionless" ?
> > To solve this, we can define it like this:
> > 1. if PMD does not set _SESSIONLESS feature flag, that implicitly mean
> > it support session based only (which is current case) 2. if PMD does
> > set _SESSIONLESS feature flag, then app can certainly use sessionless,
> > but if it invokes session init API, then
> >   - if PMD don't have session support, it should return NOT_SUPPORTED in
> session_init()
> >   - if PMD do have session support (which will be our case), then it
> > will allow session APIs. Then its app discretion to choose either of
> > these
> >
> > Does this sounds okay?
> >
> > Thanks
> > Shally
> [Fiona] Yes, this is ok for me.
> Or to paraphrase:
> sessionless feature flag just informs about sessionless.
> The response to session_init() informs whether sessions are supported or not.
>
That sounds perfect. So, we will have v2 for this? 

Thanks
Shally
 

Re: [dpdk-dev] [EXT] [PATCH 1/3] cryptodev: rework api of rsa algorithm

[Shally Verma]

> -Original Message-
> From: Trahe, Fiona 
> Sent: Friday, June 28, 2019 10:25 PM
> To: Kusztal, ArkadiuszX ; Shally Verma
> ; dev@dpdk.org
> Cc: akhil.go...@nxp.com; shally.ve...@caviumnetworks.com; Trahe, Fiona
> 
> Subject: RE: [EXT] [PATCH 1/3] cryptodev: rework api of rsa algorithm
> 
> Hi Arek, Shally,
> 
> Comments below.
> @Arek, I'd suggest sending a v2 after this, updated with whatever issues can
> be closed and a listing of the issues still open.
> As getting hard to follow the thread.
> @Shally, can you reply please - just with whatever items below you're ok
> with, so Arek can do the v2.
> And we can continue discussion on the v2 on anything still open.
> 
...

> > > > --- a/lib/librte_cryptodev/rte_crypto_asym.h
> > > > +++ b/lib/librte_cryptodev/rte_crypto_asym.h
> > > > @@ -111,23 +111,33 @@ enum rte_crypto_asym_op_type {
> > > >   */
> > > >  enum rte_crypto_rsa_padding_type {
> > > > RTE_CRYPTO_RSA_PADDING_NONE = 0,
> > > > -   /**< RSA no padding scheme */
> > > > -   RTE_CRYPTO_RSA_PKCS1_V1_5_BT0,
> > > > -   /**< RSA PKCS#1 V1.5 Block Type 0 padding scheme
> > > > -* as described in rfc2313
> > > > -*/
> > > > -   RTE_CRYPTO_RSA_PKCS1_V1_5_BT1,
> > > > -   /**< RSA PKCS#1 V1.5 Block Type 01 padding scheme
> > > > -* as described in rfc2313
> > > > -*/
> > > > -   RTE_CRYPTO_RSA_PKCS1_V1_5_BT2,
> > > > -   /**< RSA PKCS#1 V1.5 Block Type 02 padding scheme
> > > > -* as described in rfc2313
> > > > +   /**< RSA no padding scheme.
> > > > +* In this case user is responsible for providing and 
> > > > verification
> > > > +* of padding.
> [Fiona] Grammar: provision not providing
> 
> > > > +* In case RTE_CRYPTO_ASYM_OP_VERIFY op type is used if no
> > > > +* problems in public key 'encryption' detected driver SHALL 
> > > > return
> > > > +* RTE_CRYPTO_OP_STATUS_SUCCESS.
> > >
> > > [Shally] This is not clear to me. OP_VERIFY is public key
> > > decryption, then why it is mentioned as 'encryption' above?
> >
> > [AK] - yes, you right 'decryption', public key but technically decryption.
> > > Secondly,  Any public/private key encryption with NO_PADDING scheme,
> > > would result in encryption data without any padding string.
> > > And, if same is passed to PMD for decryption with PADDING_NONE, then
> > > PMD would assume encryption block is without any padding string.
> > > So, which case are we trying to clarify here? Or, do you intend to
> > > mention case when app can pass data with padding for decryption with
> > > NO_PADDING scheme?
> >
> > [AK] Yes. It may be common situation that HW drivers wont natively be
> > doing any padding, Especially PSS and OAEP which expects very strong
> > TRNG. NO_PADDING would mean that driver should not be responsible for
> > padding, and not care what is in there as long as parameters are correct.
> [Fiona] just to add to that - PADDING_NONE typically really means
> PADDING_DONE_BY_APPLICATION But using the NONE terminology is
> consistent with openssl lib, so I think we should stick with that.
> 
[Shally] I look forward to v2 to comment further on this.

...

> >
> > [AK] About BT 00 it is nothing else than zero padding, plaintext RSA,
> > more or less the same thing as NO_PADDING. It has been silently
> > abandoned long time ago. Only RFC 2313 mentions it. No 2437,3447 and
> 8017.
> [Fiona] Actually as PKCS#1 v1.5 is less secure for encryption than OAEP,
> arguably it should be removed too from this enum to discourage its use.
> However as it's still commonly used we need to keep it. We should make
> sure that capability allows a PMD to opt out of supporting it if it chooses to
> only support PSS and OAEP.
> 
[Shally] We have been practically using it , so I can say it is still very much 
in use.
we can update capability to check for supported padding type if PMD does not 
support all. 
Regarding BT0 did we conclude to remove BT0 as practically not in use and then 
we're using PKCS _V1.5 only.
If yes, am fine with this.

> >


> > > [Shally] Better to add version V2 here: RSA PKCS#1 V2 OAEP padding
> > > scheme
> >
> > [AK] Usually V2 is not added to it. Example from openssl "
> > RSA_padding_add_PKCS1_OAEP",
> [Fiona] Agree with Arek, better to leave out v2.
> 
[Shally] Okay. Agree to both Arek, Fiona here. 

...

> > >
> > > >Returned data is in Big-Endian format which means
> > > > +* that Least-Significant byte will be placed at top byte of an 
> > > > array
> > > > +* (at message.data[message.length - 1]), cipher.length SHALL
> > > > +* therefore remain unchanged.
> > >
> > > [Shally] Do we really need to mention it?
> >
> > [AK] I have not pronounced myself very clear here, and I forgot to add it to
> the message data.
> > For example we have 256 bytes allocated for RSA-2048 let say
> > decryption. But we decrypted only 255 bytes (one leading zero).
> > So should we trim this zero or not? 

Re: [dpdk-dev] [EXT] [PATCH v4 2/6] app/test-compress-perf: add ptest command line option

[Shally Verma]

> -Original Message-
> From: Tomasz Jozwiak 
> Sent: Friday, June 28, 2019 3:56 AM
> To: dev@dpdk.org; fiona.tr...@intel.com; tjozwia...@gmail.com; Shally
> Verma ; arturx.tryb...@intel.com
> Subject: [EXT] [PATCH v4 2/6] app/test-compress-perf: add ptest command
> line option
> 
> External Email
> 
> --
> From: Tomasz Jozwiak 
> 
> This patch adds --ptest option to make possible a choose of test case from
> command line.
> 
> Signed-off-by: Tomasz Jozwiak 
> Signed-off-by: Tomasz Jozwiak 
> ---
Acked-by: Shally Verma 

..

Re: [dpdk-dev] [EXT] [PATCH v4 3/6] app/test-compress-perf: add verification test case

[Shally Verma]

> -Original Message-
> From: Tomasz Jozwiak 
> Sent: Friday, June 28, 2019 3:56 AM
> To: dev@dpdk.org; fiona.tr...@intel.com; tjozwia...@gmail.com; Shally
> Verma ; arturx.tryb...@intel.com
> Subject: [EXT] [PATCH v4 3/6] app/test-compress-perf: add verification test
> case
> 
> External Email
> 
> --
> From: Tomasz Jozwiak 
...

> diff --git a/app/test-compress-perf/comp_perf_test_verify.c b/app/test-
> compress-perf/comp_perf_test_verify.c
> index 28a0fe8..c2aab70 100644
> --- a/app/test-compress-perf/comp_perf_test_verify.c
> +++ b/app/test-compress-perf/comp_perf_test_verify.c
> @@ -8,14 +8,48 @@
>  #include 
> 
>  #include "comp_perf_test_verify.h"
> +#include "comp_perf_test_common.h"
> +
> +void
> +cperf_verify_test_destructor(void *arg) {
> + if (arg) {
> + comp_perf_free_memory(&((struct cperf_verify_ctx *)arg)-
> >mem);
> + rte_free(arg);
> + }
> +}
> +
> +void *
> +cperf_verify_test_constructor(uint8_t dev_id, uint16_t qp_id,
> + struct comp_test_data *options)
> +{
> + struct cperf_verify_ctx *ctx = NULL;
> +
> + ctx = rte_malloc(NULL, sizeof(struct cperf_verify_ctx), 0);
> +
Better just return from here

> + if (ctx != NULL) {
> + ctx->mem.dev_id = dev_id;
> + ctx->mem.qp_id = qp_id;
> + ctx->options = options;
> +
> + if (!comp_perf_allocate_memory(ctx->options, &ctx->mem)
> &&
> + !prepare_bufs(ctx->options, &ctx->mem))
> + return ctx;
What if condition fails on comp_per_allocate_memory(), then it will go to 
verify_test_destructor(), so comp_perf_free_memory() check if mem != NULL 
before calling actual free?

> + }
> +
> + cperf_verify_test_destructor(ctx);
> + return NULL;
> +}
> 
>  static int
> -main_loop(struct comp_test_data *test_data, uint8_t level,
> - enum rte_comp_xform_type type,
> - uint8_t *output_data_ptr,
> - size_t *output_data_sz)
> +main_loop(struct cperf_verify_ctx *ctx, enum rte_comp_xform_type type)

...
> --
> 2.7.4

Re: [dpdk-dev] [EXT] [PATCH v4 5/6] doc: update dpdk-test-compress-perf description

[Shally Verma]

> -Original Message-
> From: Tomasz Jozwiak 
> Sent: Friday, June 28, 2019 3:56 AM
> To: dev@dpdk.org; fiona.tr...@intel.com; tjozwia...@gmail.com; Shally
> Verma ; arturx.tryb...@intel.com
> Subject: [EXT] [PATCH v4 5/6] doc: update dpdk-test-compress-perf
> description
> 
> External Email
> 
> --
> From: Tomasz Jozwiak 
> 
> This patch updates a dpdk-test-compress-perf documentation.
> 
> Signed-off-by: Tomasz Jozwiak 
> ---
Acked-by: Shally Verma 

Re: [dpdk-dev] [EXT] [PATCH v4 6/6] app/test-compress-perf: add force process termination

[Shally Verma]

> -Original Message-
> From: Tomasz Jozwiak 
> Sent: Friday, June 28, 2019 3:56 AM
> To: dev@dpdk.org; fiona.tr...@intel.com; tjozwia...@gmail.com; Shally
> Verma ; arturx.tryb...@intel.com
> Subject: [EXT] [PATCH v4 6/6] app/test-compress-perf: add force process
> termination
> 
> External Email
> 
> --
> From: Tomasz Jozwiak 
> 
> This patch adds a possibility to force controlled process termination as a
> result of two signals: SIGTERM and SIGINT
> 
> Signed-off-by: Tomasz Jozwiak 
> ---
Acked-by: Shally Verma 

[dpdk-dev] [RFC 2/5] ticketlock: use new API to reduce contention on aarch64

[Gavin Hu]

While using ticket lock, cores repeatedly poll the lock variable.
This is replaced by rte_wait_until_equal API.

Running ticketlock_autotest on ThunderX2, with different numbers of cores
and depths of rings, 3%~8% performance gains were measured.

Signed-off-by: Gavin Hu 
Reviewed-by: Honnappa Nagarahalli 
---
 lib/librte_eal/common/include/generic/rte_ticketlock.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/common/include/generic/rte_ticketlock.h 
b/lib/librte_eal/common/include/generic/rte_ticketlock.h
index 191146f..6820f01 100644
--- a/lib/librte_eal/common/include/generic/rte_ticketlock.h
+++ b/lib/librte_eal/common/include/generic/rte_ticketlock.h
@@ -64,8 +64,8 @@ static inline __rte_experimental void
 rte_ticketlock_lock(rte_ticketlock_t *tl)
 {
uint16_t me = __atomic_fetch_add(&tl->s.next, 1, __ATOMIC_RELAXED);
-   while (__atomic_load_n(&tl->s.current, __ATOMIC_ACQUIRE) != me)
-   rte_pause();
+   if (__atomic_load_n(&tl->s.current, __ATOMIC_ACQUIRE) != me)
+   rte_wait_until_equal_acquire(&tl->s.current, me);
 }
 
 /**
-- 
2.7.4

[dpdk-dev] [RFC 3/5] ring: use wfe to wait for ring tail update on aarch64

[Gavin Hu]

Instead of polling for tail to be updated, use wfe instruction.

50%~70% performance gain was measured by running ring_perf_autotest on
ThunderX2.

Signed-off-by: Gavin Hu 
Reviewed-by: Ruifeng Wang 
Reviewed-by: Steve Capper 
Reviewed-by: Ola Liljedahl 
Reviewed-by: Honnappa Nagarahalli 

---
 lib/librte_ring/rte_ring_c11_mem.h | 5 +++--
 lib/librte_ring/rte_ring_generic.h | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/librte_ring/rte_ring_c11_mem.h 
b/lib/librte_ring/rte_ring_c11_mem.h
index 0fb73a3..f1de79c 100644
--- a/lib/librte_ring/rte_ring_c11_mem.h
+++ b/lib/librte_ring/rte_ring_c11_mem.h
@@ -2,6 +2,7 @@
  *
  * Copyright (c) 2017,2018 HXT-semitech Corporation.
  * Copyright (c) 2007-2009 Kip Macy km...@freebsd.org
+ * Copyright (c) 2019 Arm Limited
  * All rights reserved.
  * Derived from FreeBSD's bufring.h
  * Used as BSD-3 Licensed with permission from Kip Macy.
@@ -21,8 +22,8 @@ update_tail(struct rte_ring_headtail *ht, uint32_t old_val, 
uint32_t new_val,
 * we need to wait for them to complete
 */
if (!single)
-   while (unlikely(ht->tail != old_val))
-   rte_pause();
+   if (unlikely(ht->tail != old_val))
+   rte_wait_until_equal_relaxed(&ht->tail, old_val);
 
__atomic_store_n(&ht->tail, new_val, __ATOMIC_RELEASE);
 }
diff --git a/lib/librte_ring/rte_ring_generic.h 
b/lib/librte_ring/rte_ring_generic.h
index 953cdbb..bb0dce0 100644
--- a/lib/librte_ring/rte_ring_generic.h
+++ b/lib/librte_ring/rte_ring_generic.h
@@ -23,8 +23,8 @@ update_tail(struct rte_ring_headtail *ht, uint32_t old_val, 
uint32_t new_val,
 * we need to wait for them to complete
 */
if (!single)
-   while (unlikely(ht->tail != old_val))
-   rte_pause();
+   if (unlikely(ht->tail != old_val))
+   rte_wait_until_equal_relaxed(&ht->tail, old_val);
 
ht->tail = new_val;
 }
-- 
2.7.4

[dpdk-dev] [RFC 0/5] use WFE for locks and ring on aarch64

[Gavin Hu]

DPDK has multiple use cases where the core repeatedly polls a location in
memory. This polling results in many cache and memory transactions.

Arm architecture provides WFE (Wait For Event) instruction, which allows
the cpu core to enter a low power state until woken up by the update to the
memory location being polled. Thus reducing the cache and memory
transactions.

x86 has the PAUSE hint instruction to reduce such overhead.

The rte_wait_until_equal_xxx APIs abstract the functionality of 'polling
for a memory location to become equal to a given value'.

For non-Arm platforms, these APIs are just wrappers around do-while loop
with rte_pause, so there are no performance differences.

For Arm platforms, use of WFE can be configured using CONFIG_RTE_USE_WFE
option. It is disabled by default.

Currently, use of WFE is supported only for aarch64 platforms. armv7
platforms do support the WFE instruction, but they require explicit wake up
events(sev) and are less performannt.

Testing shows that, performance varies across different platforms, with
some showing degradation.

CONFIG_RTE_USE_WFE should be enabled depending on the performance on the
target platforms.

Gavin Hu (5):
  eal: add the APIs to wait until equal
  ticketlock: use new API to reduce contention on aarch64
  ring: use wfe to wait for ring tail update on aarch64
  spinlock: use wfe to reduce contention on aarch64
  config: add WFE config entry for aarch64

 config/arm/meson.build |   1 +
 config/common_armv8a_linux |   6 +
 .../common/include/arch/arm/rte_pause_64.h | 143 +
 .../common/include/arch/arm/rte_spinlock.h |  25 
 lib/librte_eal/common/include/generic/rte_pause.h  |  20 +++
 .../common/include/generic/rte_spinlock.h  |   2 +-
 .../common/include/generic/rte_ticketlock.h|   4 +-
 lib/librte_ring/rte_ring_c11_mem.h |   5 +-
 lib/librte_ring/rte_ring_generic.h |   4 +-
 9 files changed, 203 insertions(+), 7 deletions(-)

-- 
2.7.4

[dpdk-dev] [RFC 1/5] eal: add the APIs to wait until equal

[Gavin Hu]

The rte_wait_until_equal_xxx APIs abstract the functionality of 'polling
for a memory location to become equal to a given value'.

Signed-off-by: Gavin Hu 
Reviewed-by: Ruifeng Wang 
Reviewed-by: Steve Capper 
Reviewed-by: Ola Liljedahl 
Reviewed-by: Honnappa Nagarahalli 
---
 .../common/include/arch/arm/rte_pause_64.h | 143 +
 lib/librte_eal/common/include/generic/rte_pause.h  |  20 +++
 2 files changed, 163 insertions(+)

diff --git a/lib/librte_eal/common/include/arch/arm/rte_pause_64.h 
b/lib/librte_eal/common/include/arch/arm/rte_pause_64.h
index 93895d3..0095da6 100644
--- a/lib/librte_eal/common/include/arch/arm/rte_pause_64.h
+++ b/lib/librte_eal/common/include/arch/arm/rte_pause_64.h
@@ -17,6 +17,149 @@ static inline void rte_pause(void)
asm volatile("yield" ::: "memory");
 }
 
+#ifdef RTE_USE_WFE
+#define rte_wait_until_equal_relaxed(addr, expected) do {\
+   typeof(*addr) tmp;  \
+   if (__builtin_constant_p((expected))) \
+   do { \
+   if (sizeof(*(addr)) == 16)\
+   asm volatile(  \
+   "sevl\n"  \
+   "1:  wfe\n"  \
+   "ldxrh  %w0, %1\n"  \
+   "cmp%w0, %w2\n"  \
+   "bne1b\n"  \
+   : "=&r"(tmp)  \
+   : "Q"(*addr), "i"(expected)  \
+   : "cc", "memory");  \
+   else if (sizeof(*(addr)) == 32)\
+   asm volatile(  \
+   "sevl\n"  \
+   "1:  wfe\n"  \
+   "ldxr  %w0, %1\n"  \
+   "cmp%w0, %w2\n"  \
+   "bne1b\n"  \
+   : "=&r"(tmp)  \
+   : "Q"(*addr), "i"(expected)  \
+   : "cc", "memory");  \
+   else if (sizeof(*(addr)) == 64)\
+   asm volatile(  \
+   "sevl\n"  \
+   "1:  wfe\n"  \
+   "ldxr  %x0, %1\n"  \
+   "cmp%x0, %x2\n"  \
+   "bne1b\n"  \
+   : "=&r" (tmp)  \
+   : "Q"(*addr), "i"(expected)  \
+   : "cc", "memory"); \
+   } while (0); \
+   else \
+   do { \
+   if (sizeof(*(addr)) == 16)\
+   asm volatile(  \
+   "sevl\n"  \
+   "1:  wfe\n"  \
+   "ldxrh  %w0, %1\n"  \
+   "cmp%w0, %w2\n"  \
+   "bne1b\n"  \
+   : "=&r"(tmp)  \
+   : "Q"(*addr), "r"(expected)  \
+   : "cc", "memory");  \
+   else if (sizeof(*(addr)) == 32)\
+   asm volatile(  \
+   "sevl\n"  \
+   "1:  wfe\n"  \
+   "ldxr  %w0, %1\n"  \
+   "cmp%w0, %w2\n"  \
+   "bne1b\n"  \
+   : "=&r"(tmp)  \
+   : "Q"(*addr), "r"(expected)  \
+   : "cc", "memory");  \
+   else if (sizeof(*(addr)) == 64)\
+   asm volatile(  \
+   "sevl\n"  \
+   "1:  wfe\n"  \
+   "ldxr  %x0, %1\n"  \
+   "cmp%x0, %x2\n"  \
+   "bne1b\n"  \
+   : "=&r" (tmp)  \
+

[dpdk-dev] [RFC 4/5] spinlock: use wfe to reduce contention on aarch64

[Gavin Hu]

In acquiring a spinlock, cores repeatedly poll the lock variable.
This is replaced by rte_wait_until_equal API.

20% performance gain was measured by running spinlock_autotest on 14
isolated cores of ThunderX2.

Signed-off-by: Gavin Hu 
Reviewed-by: Ruifeng Wang 
Reviewed-by: Phil Yang 
Reviewed-by: Steve Capper 
Reviewed-by: Ola Liljedahl 
Reviewed-by: Honnappa Nagarahalli 
---
 .../common/include/arch/arm/rte_spinlock.h | 25 ++
 .../common/include/generic/rte_spinlock.h  |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/lib/librte_eal/common/include/arch/arm/rte_spinlock.h 
b/lib/librte_eal/common/include/arch/arm/rte_spinlock.h
index 1a6916b..b7e8521 100644
--- a/lib/librte_eal/common/include/arch/arm/rte_spinlock.h
+++ b/lib/librte_eal/common/include/arch/arm/rte_spinlock.h
@@ -16,6 +16,31 @@ extern "C" {
 #include 
 #include "generic/rte_spinlock.h"
 
+/* armv7a does support WFE, but an explicit wake-up signal using SEV is
+ * required (must be preceded by DSB to drain the store buffer) and
+ * this is less performant, so keep armv7a implementation unchanged.
+ */
+#if defined(RTE_USE_WFE) && defined(RTE_ARCH_ARM64)
+static inline void
+rte_spinlock_lock(rte_spinlock_t *sl)
+{
+   unsigned int tmp;
+   /* http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.
+* faqs/ka16809.html
+*/
+   asm volatile(
+   "sevl\n"
+   "1:  wfe\n"
+   "2:  ldaxr   %w0, %1\n"
+   "cbnz   %w0, 1b\n"
+   "stxr   %w0, %w2, %1\n"
+   "cbnz   %w0, 2b\n"
+   : "=&r" (tmp), "+Q"(sl->locked)
+   : "r" (1)
+   : "cc", "memory");
+}
+#endif
+
 static inline int rte_tm_supported(void)
 {
return 0;
diff --git a/lib/librte_eal/common/include/generic/rte_spinlock.h 
b/lib/librte_eal/common/include/generic/rte_spinlock.h
index 87ae7a4..cf4f15b 100644
--- a/lib/librte_eal/common/include/generic/rte_spinlock.h
+++ b/lib/librte_eal/common/include/generic/rte_spinlock.h
@@ -57,7 +57,7 @@ rte_spinlock_init(rte_spinlock_t *sl)
 static inline void
 rte_spinlock_lock(rte_spinlock_t *sl);
 
-#ifdef RTE_FORCE_INTRINSICS
+#if defined(RTE_FORCE_INTRINSICS) && !defined(RTE_USE_WFE)
 static inline void
 rte_spinlock_lock(rte_spinlock_t *sl)
 {
-- 
2.7.4

[dpdk-dev] [RFC 5/5] config: add WFE config entry for aarch64

[Gavin Hu]

Add the RTE_USE_WFE configuration entry for aarch64, disabled by default.
It can be enabled selectively based on the performance benchmarking.

Signed-off-by: Gavin Hu 
Reviewed-by: Ruifeng Wang 
Reviewed-by: Steve Capper 
Reviewed-by: Honnappa Nagarahalli 
---
 config/arm/meson.build | 1 +
 config/common_armv8a_linux | 6 ++
 2 files changed, 7 insertions(+)

diff --git a/config/arm/meson.build b/config/arm/meson.build
index 6fa06a1..939d60e 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -116,6 +116,7 @@ impl_dpaa = ['NXP DPAA', flags_dpaa, machine_args_generic]
 impl_dpaa2 = ['NXP DPAA2', flags_dpaa2, machine_args_generic]
 
 dpdk_conf.set('RTE_FORCE_INTRINSICS', 1)
+dpdk_conf.set('RTE_USE_WFE', 0)
 
 if not dpdk_conf.get('RTE_ARCH_64')
dpdk_conf.set('RTE_CACHE_LINE_SIZE', 64)
diff --git a/config/common_armv8a_linux b/config/common_armv8a_linux
index 72091de..ae87a87 100644
--- a/config/common_armv8a_linux
+++ b/config/common_armv8a_linux
@@ -12,6 +12,12 @@ CONFIG_RTE_ARCH_64=y
 
 CONFIG_RTE_FORCE_INTRINSICS=y
 
+# Use WFE instructions to implement the rte_wait_for_equal_xxx APIs,
+# calling these APIs put the cores enter low power state while waiting
+# for the memory address to be become equal to the expected value.
+# This is supported only by aarch64.
+CONFIG_RTE_USE_WFE=n
+
 # Maximum available cache line size in arm64 implementations.
 # Setting to maximum available cache line size in generic config
 # to address minimum DMA alignment across all arm64 implementations.
-- 
2.7.4

[dpdk-dev] [PATCH 1/2] app/eventdev: fix order test port creation

[pbhagavatula]

From: Pavan Nikhilesh 

Configure event ports based on the underlying event device info rather
than using hardcoded values.

Cc: sta...@dpdk.org
Fixes: 5710e751813e ("app/testeventdev: add order port setup")

Signed-off-by: Pavan Nikhilesh 
---
 app/test-eventdev/test_order_common.c | 32 ++-
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/app/test-eventdev/test_order_common.c 
b/app/test-eventdev/test_order_common.c
index 8a3420130..252e4a14c 100644
--- a/app/test-eventdev/test_order_common.c
+++ b/app/test-eventdev/test_order_common.c
@@ -67,6 +67,11 @@ order_producer(void *arg)
 int
 order_opt_check(struct evt_options *opt)
 {
+   if (opt->prod_type != EVT_PROD_TYPE_SYNT) {
+   evt_err("Invalid producer type");
+   return -EINVAL;
+   }
+
/* 1 producer + N workers + 1 master */
if (rte_lcore_count() < 3) {
evt_err("test need minimum 3 lcores");
@@ -298,12 +303,23 @@ order_event_dev_port_setup(struct evt_test *test, struct 
evt_options *opt,
int ret;
uint8_t port;
struct test_order *t = evt_test_priv(test);
+   struct rte_event_dev_info dev_info;
+
+   memset(&dev_info, 0, sizeof(struct rte_event_dev_info));
+   ret = rte_event_dev_info_get(opt->dev_id, &dev_info);
+   if (ret) {
+   evt_err("failed to get eventdev info %d", opt->dev_id);
+   return ret;
+   }
+
+   if (opt->wkr_deq_dep > dev_info.max_event_port_dequeue_depth)
+   opt->wkr_deq_dep = dev_info.max_event_port_dequeue_depth;
 
/* port configuration */
-   const struct rte_event_port_conf wkr_p_conf = {
+   const struct rte_event_port_conf p_conf = {
.dequeue_depth = opt->wkr_deq_dep,
-   .enqueue_depth = 64,
-   .new_event_threshold = 4096,
+   .enqueue_depth = dev_info.max_event_port_dequeue_depth,
+   .new_event_threshold = dev_info.max_num_events,
};
 
/* setup one port per worker, linking to all queues */
@@ -314,7 +330,7 @@ order_event_dev_port_setup(struct evt_test *test, struct 
evt_options *opt,
w->port_id = port;
w->t = t;
 
-   ret = rte_event_port_setup(opt->dev_id, port, &wkr_p_conf);
+   ret = rte_event_port_setup(opt->dev_id, port, &p_conf);
if (ret) {
evt_err("failed to setup port %d", port);
return ret;
@@ -326,12 +342,6 @@ order_event_dev_port_setup(struct evt_test *test, struct 
evt_options *opt,
return -EINVAL;
}
}
-   /* port for producer, no links */
-   const struct rte_event_port_conf prod_conf = {
-   .dequeue_depth = 8,
-   .enqueue_depth = 32,
-   .new_event_threshold = 1200,
-   };
struct prod_data *p = &t->prod;
 
p->dev_id = opt->dev_id;
@@ -339,7 +349,7 @@ order_event_dev_port_setup(struct evt_test *test, struct 
evt_options *opt,
p->queue_id = 0;
p->t = t;
 
-   ret = rte_event_port_setup(opt->dev_id, port, &prod_conf);
+   ret = rte_event_port_setup(opt->dev_id, port, &p_conf);
if (ret) {
evt_err("failed to setup producer port %d", port);
return ret;
-- 
2.21.0

[dpdk-dev] [PATCH 2/2] test/eventdev: fix producer core validity checks

[pbhagavatula]

From: Pavan Nikhilesh 

When producer type is event timer adapter producer lcore checks are
skipped. Since, timer adapter relies on SW to arm timers producer lcore
is essential for its functionality.
Verify producer lcore validity when producer type is event timer
adapter.

Cc: sta...@dpdk.org
Fixes: b01974da9f25 ("app/eventdev: add ethernet device producer option")

Signed-off-by: Pavan Nikhilesh 
---
 app/test-eventdev/test_perf_common.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/test-eventdev/test_perf_common.c 
b/app/test-eventdev/test_perf_common.c
index 01f782820..2e9e83e88 100644
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -562,7 +562,8 @@ perf_opt_check(struct evt_options *opt, uint64_t nb_queues)
return -1;
}
 
-   if (opt->prod_type == EVT_PROD_TYPE_SYNT) {
+   if (opt->prod_type == EVT_PROD_TYPE_SYNT ||
+   opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR) {
/* Validate producer lcores */
if (evt_lcores_has_overlap(opt->plcores,
rte_get_master_lcore())) {
-- 
2.21.0

[dpdk-dev] [PATCH v2 00/57] OCTEON TX2 Ethdev driver

[jerinj]

From: Jerin Jacob 

This patchset adds support for OCTEON TX2 ethdev driver.

v2:
# Moved maintainers file to the first patch(Ferruh)
# removed reference to to v19.05(Ferruh) 
# Makefile/Meson CFLAGS moved to specific patches(Ferruh)
# Move Documentation updates to specific patches(Ferruh)
# reworked the code to remove the need for exposing
otx2_nix_fastpath_lookup_mem_get function(Ferruh)
# Updated goto logic in net/octeontx2: add FW version get operation(Ferruh)
# Added "add Rx interrupts support" patch

Harman Kalra (3):
  net/octeontx2: add PTP base support
  net/octeontx2: add remaining PTP operations
  net/octeontx2: add Rx interrupts support

Jerin Jacob (16):
  net/octeontx2: add build and doc infrastructure
  net/octeontx2: add ethdev probe and remove
  net/octeontx2: add device init and uninit
  net/octeontx2: add devargs parsing functions
  net/octeontx2: handle device error interrupts
  net/octeontx2: add info get operation
  net/octeontx2: add device configure operation
  net/octeontx2: handle queue specific error interrupts
  net/octeontx2: add context debug utils
  net/octeontx2: add Rx queue setup and release
  net/octeontx2: add Tx queue setup and release
  net/octeontx2: add ptype support
  net/octeontx2: add Rx and Tx descriptor operations
  net/octeontx2: add Rx burst support
  net/octeontx2: add Rx vector version
  net/octeontx2: add Tx burst support

Kiran Kumar K (13):
  net/octeontx2: add register dump support
  net/octeontx2: add basic stats operation
  net/octeontx2: add extended stats operations
  net/octeontx2: introducing flow driver
  net/octeontx2: add flow utility functions
  net/octeontx2: add flow mbox utility functions
  net/octeontx2: add flow MCAM utility functions
  net/octeontx2: add flow parsing for outer layers
  net/octeontx2: add flow actions support
  net/octeontx2: add flow parse actions support
  net/octeontx2: add flow operations
  net/octeontx2: add flow destroy ops support
  net/octeontx2: add flow init and fini

Krzysztof Kanas (2):
  net/octeontx2: alloc and free TM HW resources
  net/octeontx2: enable Tx through traffic manager

Nithin Dabilpuram (9):
  net/octeontx2: add queue start and stop operations
  net/octeontx2: introduce traffic manager
  net/octeontx2: configure TM HW resources
  net/octeontx2: add queue info and pool supported operations
  net/octeontx2: add Rx multi segment version
  net/octeontx2: add Tx multi segment version
  net/octeontx2: add Tx vector version
  net/octeontx2: add device start operation
  net/octeontx2: add device stop and close operations

Sunil Kumar Kori (1):
  net/octeontx2: add unicast MAC filter

Vamsi Attunuru (8):
  net/octeontx2: add link stats operations
  net/octeontx2: add promiscuous and allmulticast mode
  net/octeontx2: add RSS support
  net/octeontx2: handle port reconfigure
  net/octeontx2: add module EEPROM dump
  net/octeontx2: add flow control support
  net/octeontx2: add FW version get operation
  net/octeontx2: add MTU set operation

Vivek Sharma (5):
  net/octeontx2: connect flow API to ethdev ops
  net/octeontx2: implement VLAN utility functions
  net/octeontx2: support VLAN offloads
  net/octeontx2: support VLAN filters
  net/octeontx2: support VLAN TPID and PVID for Tx

 MAINTAINERS   |9 +
 config/common_base|5 +
 doc/guides/nics/features/octeontx2.ini|   50 +
 doc/guides/nics/features/octeontx2_vec.ini|   46 +
 doc/guides/nics/features/octeontx2_vf.ini |   42 +
 doc/guides/nics/index.rst |1 +
 doc/guides/nics/octeontx2.rst |  302 +++
 doc/guides/platform/octeontx2.rst |3 +
 drivers/net/Makefile  |1 +
 drivers/net/meson.build   |6 +-
 drivers/net/octeontx2/Makefile|   55 +
 drivers/net/octeontx2/meson.build |   40 +
 drivers/net/octeontx2/otx2_ethdev.c   | 1996 +
 drivers/net/octeontx2/otx2_ethdev.h   |  529 +
 drivers/net/octeontx2/otx2_ethdev_debug.c |  500 +
 drivers/net/octeontx2/otx2_ethdev_devargs.c   |  165 ++
 drivers/net/octeontx2/otx2_ethdev_irq.c   |  468 
 drivers/net/octeontx2/otx2_ethdev_ops.c   |  461 
 drivers/net/octeontx2/otx2_flow.c |  981 
 drivers/net/octeontx2/otx2_flow.h |  390 
 drivers/net/octeontx2/otx2_flow_ctrl.c|  220 ++
 drivers/net/octeontx2/otx2_flow_parse.c   |  947 
 drivers/net/octeontx2/otx2_flow_utils.c   |  910 
 drivers/net/octeontx2/otx2_link.c |  108 +
 drivers/net/octeontx2/otx2_lookup.c   |  315 +++
 drivers/net/octeontx2/otx2_mac.c  |  149 ++
 drivers/net/octeontx2/otx2_ptp.c  |  273 +++
 drivers/net/octeontx2/otx2_rss.c  |  372 +++
 drivers/net/octeontx2/otx2_rx.c   |  411 
 drivers/net/octeontx2/otx2_rx.h   |  333 +++
 drivers/

[dpdk-dev] [PATCH v2 02/57] net/octeontx2: add ethdev probe and remove

[jerinj]

From: Jerin Jacob 

add basic PCIe ethdev probe and remove.

Signed-off-by: Jerin Jacob 
Signed-off-by: Nithin Dabilpuram 
---
 drivers/net/octeontx2/Makefile  |  8 ++-
 drivers/net/octeontx2/meson.build   | 14 -
 drivers/net/octeontx2/otx2_ethdev.c | 93 +
 drivers/net/octeontx2/otx2_ethdev.h | 27 +
 4 files changed, 140 insertions(+), 2 deletions(-)
 create mode 100644 drivers/net/octeontx2/otx2_ethdev.h

diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index 9c467352f..b3060e2dd 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -15,6 +15,11 @@ CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2
 CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx2
 CFLAGS += -O3
 
+ifneq ($(CONFIG_RTE_ARCH_64),y)
+CFLAGS += -Wno-int-to-pointer-cast
+CFLAGS += -Wno-pointer-to-int-cast
+endif
+
 EXPORT_MAP := rte_pmd_octeontx2_version.map
 
 LIBABIVER := 1
@@ -25,6 +30,7 @@ LIBABIVER := 1
 SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
otx2_ethdev.c
 
-LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2
+LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2 -lrte_eal
+LDLIBS += -lrte_ethdev -lrte_bus_pci
 
 include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index 0d0ca32da..db375f33b 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -6,4 +6,16 @@ sources = files(
'otx2_ethdev.c',
)
 
-deps += ['common_octeontx2', 'mempool_octeontx2']
+deps += ['bus_pci', 'common_octeontx2', 'mempool_octeontx2']
+
+extra_flags = []
+# This integrated controller runs only on a arm64 machine, remove 32bit 
warnings
+if not dpdk_conf.get('RTE_ARCH_64')
+   extra_flags += ['-Wno-int-to-pointer-cast', '-Wno-pointer-to-int-cast']
+endif
+
+foreach flag: extra_flags
+   if cc.has_argument(flag)
+   cflags += flag
+   endif
+endforeach
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index d26535dee..05fa8988e 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -1,3 +1,96 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  * Copyright(C) 2019 Marvell International Ltd.
  */
+
+#include 
+#include 
+#include 
+
+#include "otx2_ethdev.h"
+
+static int
+otx2_eth_dev_init(struct rte_eth_dev *eth_dev)
+{
+   RTE_SET_USED(eth_dev);
+
+   return -ENODEV;
+}
+
+static int
+otx2_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool mbox_close)
+{
+   RTE_SET_USED(eth_dev);
+   RTE_SET_USED(mbox_close);
+
+   return -ENODEV;
+}
+
+static int
+nix_remove(struct rte_pci_device *pci_dev)
+{
+   struct rte_eth_dev *eth_dev;
+   int rc;
+
+   eth_dev = rte_eth_dev_allocated(pci_dev->device.name);
+   if (eth_dev) {
+   /* Cleanup eth dev */
+   rc = otx2_eth_dev_uninit(eth_dev, true);
+   if (rc)
+   return rc;
+
+   rte_eth_dev_pci_release(eth_dev);
+   }
+
+   /* Nothing to be done for secondary processes */
+   if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+   return 0;
+
+   return 0;
+}
+
+static int
+nix_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
+{
+   int rc;
+
+   RTE_SET_USED(pci_drv);
+
+   rc = rte_eth_dev_pci_generic_probe(pci_dev, sizeof(struct otx2_eth_dev),
+  otx2_eth_dev_init);
+
+   /* On error on secondary, recheck if port exists in primary or
+* in mid of detach state.
+*/
+   if (rte_eal_process_type() != RTE_PROC_PRIMARY && rc)
+   if (!rte_eth_dev_allocated(pci_dev->device.name))
+   return 0;
+   return rc;
+}
+
+static const struct rte_pci_id pci_nix_map[] = {
+   {
+   RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, PCI_DEVID_OCTEONTX2_RVU_PF)
+   },
+   {
+   RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM, PCI_DEVID_OCTEONTX2_RVU_VF)
+   },
+   {
+   RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM,
+  PCI_DEVID_OCTEONTX2_RVU_AF_VF)
+   },
+   {
+   .vendor_id = 0,
+   },
+};
+
+static struct rte_pci_driver pci_nix = {
+   .id_table = pci_nix_map,
+   .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_IOVA_AS_VA |
+   RTE_PCI_DRV_INTR_LSC,
+   .probe = nix_probe,
+   .remove = nix_remove,
+};
+
+RTE_PMD_REGISTER_PCI(net_octeontx2, pci_nix);
+RTE_PMD_REGISTER_PCI_TABLE(net_octeontx2, pci_nix_map);
+RTE_PMD_REGISTER_KMOD_DEP(net_octeontx2, "vfio-pci");
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
new file mode 100644
index 0..fd01a3254
--- /dev/null
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2019 Marvel

[dpdk-dev] [PATCH v2 01/57] net/octeontx2: add build and doc infrastructure

[jerinj]

From: Jerin Jacob 

Adding bare minimum PMD library and doc build infrastructure
and claim the maintainership for octeontx2 PMD.

Signed-off-by: Jerin Jacob 
Signed-off-by: Nithin Dabilpuram 
Signed-off-by: Kiran Kumar K 
---
 MAINTAINERS   |  9 ++
 config/common_base|  5 +++
 doc/guides/nics/features/octeontx2.ini|  9 ++
 doc/guides/nics/features/octeontx2_vec.ini|  9 ++
 doc/guides/nics/features/octeontx2_vf.ini |  9 ++
 doc/guides/nics/index.rst |  1 +
 doc/guides/nics/octeontx2.rst | 32 +++
 doc/guides/platform/octeontx2.rst |  3 ++
 drivers/net/Makefile  |  1 +
 drivers/net/meson.build   |  6 +++-
 drivers/net/octeontx2/Makefile| 30 +
 drivers/net/octeontx2/meson.build |  9 ++
 drivers/net/octeontx2/otx2_ethdev.c   |  3 ++
 .../octeontx2/rte_pmd_octeontx2_version.map   |  4 +++
 mk/rte.app.mk |  2 ++
 15 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 doc/guides/nics/features/octeontx2.ini
 create mode 100644 doc/guides/nics/features/octeontx2_vec.ini
 create mode 100644 doc/guides/nics/features/octeontx2_vf.ini
 create mode 100644 doc/guides/nics/octeontx2.rst
 create mode 100644 drivers/net/octeontx2/Makefile
 create mode 100644 drivers/net/octeontx2/meson.build
 create mode 100644 drivers/net/octeontx2/otx2_ethdev.c
 create mode 100644 drivers/net/octeontx2/rte_pmd_octeontx2_version.map

diff --git a/MAINTAINERS b/MAINTAINERS
index 24431832a..37fb91d64 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -684,6 +684,15 @@ F: drivers/net/mvneta/
 F: doc/guides/nics/mvneta.rst
 F: doc/guides/nics/features/mvneta.ini
 
+Marvell OCTEON TX2
+M: Jerin Jacob 
+M: Nithin Dabilpuram 
+M: Kiran Kumar K 
+T: git://dpdk.org/next/dpdk-next-net-mrvl
+F: drivers/net/octeontx2/
+F: doc/guides/nics/features/octeontx2*.rst
+F: doc/guides/nics/octeontx2.rst
+
 Mellanox mlx4
 M: Matan Azrad 
 M: Shahaf Shuler 
diff --git a/config/common_base b/config/common_base
index e700bf1e7..6cc44b65a 100644
--- a/config/common_base
+++ b/config/common_base
@@ -411,6 +411,11 @@ CONFIG_RTE_LIBRTE_LIO_DEBUG_REGS=n
 #
 CONFIG_RTE_LIBRTE_OCTEONTX_PMD=y
 
+#
+# Compile burst-oriented Marvell OCTEON TX2 network PMD driver
+#
+CONFIG_RTE_LIBRTE_OCTEONTX2_PMD=y
+
 #
 # Compile WRS accelerated virtual port (AVP) guest PMD driver
 #
diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
new file mode 100644
index 0..84d5ad779
--- /dev/null
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -0,0 +1,9 @@
+;
+; Supported features of the 'octeontx2' network poll mode driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Linux VFIO   = Y
+ARMv8= Y
+Usage doc= Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
new file mode 100644
index 0..5fd7e4c5c
--- /dev/null
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -0,0 +1,9 @@
+;
+; Supported features of the 'octeontx2_vec' network poll mode driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Linux VFIO   = Y
+ARMv8= Y
+Usage doc= Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
new file mode 100644
index 0..3128cc120
--- /dev/null
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -0,0 +1,9 @@
+;
+; Supported features of the 'octeontx2_vf' network poll mode driver.
+;
+; Refer to default.ini for the full list of available PMD features.
+;
+[Features]
+Linux VFIO   = Y
+ARMv8= Y
+Usage doc= Y
diff --git a/doc/guides/nics/index.rst b/doc/guides/nics/index.rst
index d664c4592..9fec02f3e 100644
--- a/doc/guides/nics/index.rst
+++ b/doc/guides/nics/index.rst
@@ -46,6 +46,7 @@ Network Interface Controller Drivers
 nfb
 nfp
 octeontx
+octeontx2
 qede
 sfc_efx
 softnic
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
new file mode 100644
index 0..f0bd36be3
--- /dev/null
+++ b/doc/guides/nics/octeontx2.rst
@@ -0,0 +1,32 @@
+..  SPDX-License-Identifier: BSD-3-Clause
+Copyright(C) 2019 Marvell International Ltd.
+
+OCTEON TX2 Poll Mode driver
+===
+
+The OCTEON TX2 ETHDEV PMD (**librte_pmd_octeontx2**) provides poll mode ethdev
+driver support for the inbuilt network device found in **Marvell OCTEON TX2**
+SoC family as well as for their virtual functions (VF) in SR-IOV context.
+
+More information can be found at `Marvell Official Website
+`_.
+
+Features
+
+
+Features of the OCTEON TX2 Ethd

[dpdk-dev] [PATCH v2 03/57] net/octeontx2: add device init and uninit

[jerinj]

From: Jerin Jacob 

Add basic init and uninit function which includes
attaching LF device to probed PCIe device.

Signed-off-by: Jerin Jacob 
Signed-off-by: Nithin Dabilpuram 
Signed-off-by: Sunil Kumar Kori 
Signed-off-by: Vamsi Attunuru 
---
 drivers/net/octeontx2/Makefile  |   1 +
 drivers/net/octeontx2/meson.build   |   1 +
 drivers/net/octeontx2/otx2_ethdev.c | 277 +++-
 drivers/net/octeontx2/otx2_ethdev.h |  72 
 drivers/net/octeontx2/otx2_mac.c|  72 
 5 files changed, 418 insertions(+), 5 deletions(-)
 create mode 100644 drivers/net/octeontx2/otx2_mac.c

diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index b3060e2dd..4ff3609d2 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -28,6 +28,7 @@ LIBABIVER := 1
 # all source are stored in SRCS-y
 #
 SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
+   otx2_mac.c  \
otx2_ethdev.c
 
 LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2 -lrte_eal
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index db375f33b..b153f166d 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -3,6 +3,7 @@
 #
 
 sources = files(
+   'otx2_mac.c',
'otx2_ethdev.c',
)
 
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 05fa8988e..08f03b4c3 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -8,27 +8,277 @@
 
 #include "otx2_ethdev.h"
 
+static inline void
+otx2_eth_set_rx_function(struct rte_eth_dev *eth_dev)
+{
+   RTE_SET_USED(eth_dev);
+}
+
+static inline void
+otx2_eth_set_tx_function(struct rte_eth_dev *eth_dev)
+{
+   RTE_SET_USED(eth_dev);
+}
+
+static inline uint64_t
+nix_get_rx_offload_capa(struct otx2_eth_dev *dev)
+{
+   uint64_t capa = NIX_RX_OFFLOAD_CAPA;
+
+   if (otx2_dev_is_vf(dev))
+   capa &= ~DEV_RX_OFFLOAD_TIMESTAMP;
+
+   return capa;
+}
+
+static inline uint64_t
+nix_get_tx_offload_capa(struct otx2_eth_dev *dev)
+{
+   RTE_SET_USED(dev);
+
+   return NIX_TX_OFFLOAD_CAPA;
+}
+
+static int
+nix_lf_free(struct otx2_eth_dev *dev)
+{
+   struct otx2_mbox *mbox = dev->mbox;
+   struct nix_lf_free_req *req;
+   struct ndc_sync_op *ndc_req;
+   int rc;
+
+   /* Sync NDC-NIX for LF */
+   ndc_req = otx2_mbox_alloc_msg_ndc_sync_op(mbox);
+   ndc_req->nix_lf_tx_sync = 1;
+   ndc_req->nix_lf_rx_sync = 1;
+   rc = otx2_mbox_process(mbox);
+   if (rc)
+   otx2_err("Error on NDC-NIX-[TX, RX] LF sync, rc %d", rc);
+
+   req = otx2_mbox_alloc_msg_nix_lf_free(mbox);
+   /* Let AF driver free all this nix lf's
+* NPC entries allocated using NPC MBOX.
+*/
+   req->flags = 0;
+
+   return otx2_mbox_process(mbox);
+}
+
+static inline int
+nix_lf_attach(struct otx2_eth_dev *dev)
+{
+   struct otx2_mbox *mbox = dev->mbox;
+   struct rsrc_attach_req *req;
+
+   /* Attach NIX(lf) */
+   req = otx2_mbox_alloc_msg_attach_resources(mbox);
+   req->modify = true;
+   req->nixlf = true;
+
+   return otx2_mbox_process(mbox);
+}
+
+static inline int
+nix_lf_get_msix_offset(struct otx2_eth_dev *dev)
+{
+   struct otx2_mbox *mbox = dev->mbox;
+   struct msix_offset_rsp *msix_rsp;
+   int rc;
+
+   /* Get NPA and NIX MSIX vector offsets */
+   otx2_mbox_alloc_msg_msix_offset(mbox);
+
+   rc = otx2_mbox_process_msg(mbox, (void *)&msix_rsp);
+
+   dev->nix_msixoff = msix_rsp->nix_msixoff;
+
+   return rc;
+}
+
+static inline int
+otx2_eth_dev_lf_detach(struct otx2_mbox *mbox)
+{
+   struct rsrc_detach_req *req;
+
+   req = otx2_mbox_alloc_msg_detach_resources(mbox);
+
+   /* Detach all except npa lf */
+   req->partial = true;
+   req->nixlf = true;
+   req->sso = true;
+   req->ssow = true;
+   req->timlfs = true;
+   req->cptlfs = true;
+
+   return otx2_mbox_process(mbox);
+}
+
 static int
 otx2_eth_dev_init(struct rte_eth_dev *eth_dev)
 {
-   RTE_SET_USED(eth_dev);
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+   struct rte_pci_device *pci_dev;
+   int rc, max_entries;
 
-   return -ENODEV;
+   /* For secondary processes, the primary has done all the work */
+   if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+   /* Setup callbacks for secondary process */
+   otx2_eth_set_tx_function(eth_dev);
+   otx2_eth_set_rx_function(eth_dev);
+   return 0;
+   }
+
+   pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
+
+   rte_eth_copy_pci_info(eth_dev, pci_dev);
+   eth_dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
+
+   /* Zero out everything after OTX2_DEV to allow proper dev_reset() */
+   memset(&dev->otx2_eth_dev_data_start, 0, sizeof(*dev) -
+   

[dpdk-dev] [PATCH v2 04/57] net/octeontx2: add devargs parsing functions

[jerinj]

From: Jerin Jacob 

add various devargs command line options supported by
this driver.

Signed-off-by: Jerin Jacob 
Signed-off-by: Nithin Dabilpuram 
Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Kiran Kumar K 
Signed-off-by: Vamsi Attunuru 
---
 doc/guides/nics/octeontx2.rst   |  67 
 drivers/net/octeontx2/Makefile  |   5 +-
 drivers/net/octeontx2/meson.build   |   1 +
 drivers/net/octeontx2/otx2_ethdev.c |   7 +
 drivers/net/octeontx2/otx2_ethdev.h |  23 +++
 drivers/net/octeontx2/otx2_ethdev_devargs.c | 165 
 drivers/net/octeontx2/otx2_rx.h |  10 ++
 7 files changed, 276 insertions(+), 2 deletions(-)
 create mode 100644 drivers/net/octeontx2/otx2_ethdev_devargs.c
 create mode 100644 drivers/net/octeontx2/otx2_rx.h

diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index f0bd36be3..92a7ebc42 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -30,3 +30,70 @@ The following options may be modified in the ``config`` file.
 - ``CONFIG_RTE_LIBRTE_OCTEONTX2_PMD`` (default ``y``)
 
   Toggle compilation of the ``librte_pmd_octeontx2`` driver.
+
+Runtime Config Options
+--
+
+- ``HW offload ptype parsing disable`` (default ``0``)
+
+   Packet type parsing is HW offloaded by default and this feature may be 
toggled
+   using ``ptype_disable`` ``devargs`` parameter.
+
+- ``Rx&Tx scalar mode enable`` (default ``0``)
+
+   Ethdev supports both scalar and vector mode, it may be selected at runtime
+   using ``scalar_enable`` ``devargs`` parameter.
+
+- ``RSS reta size`` (default ``64``)
+
+   RSS redirection table size may be configured during runtime using 
``reta_size``
+   ``devargs`` parameter.
+
+   For example::
+
+  -w 0002:02:00.0,reta_size=256
+
+   With the above configuration, reta table of size 256 is populated.
+
+- ``Flow priority levels`` (default ``3``)
+
+   RTE Flow priority levels can be configured during runtime using
+   ``flow_max_priority`` ``devargs`` parameter.
+
+   For example::
+
+  -w 0002:02:00.0,flow_max_priority=10
+
+   With the above configuration, priority level was set to 10 (0-9). Max
+   priority level supported is 32.
+
+- ``Reserve Flow entries`` (default ``8``)
+
+   RTE flow entries can be pre allocated and the size of pre allocation can be
+   selected runtime using ``flow_prealloc_size`` ``devargs`` parameter.
+
+   For example::
+
+  -w 0002:02:00.0,flow_prealloc_size=4
+
+   With the above configuration, pre alloc size was set to 4. Max pre alloc
+   size supported is 32.
+
+- ``Max SQB buffer count`` (default ``512``)
+
+   Send queue descriptor buffer count may be limited during runtime using
+   ``max_sqb_count`` ``devargs`` parameter.
+
+   For example::
+
+  -w 0002:02:00.0,max_sqb_count=64
+
+   With the above configuration, each send queue's decscriptor buffer count is
+   limited to a maximum of 64 buffers.
+
+
+.. note::
+
+   Above devarg parameters are configurable per device, user needs to pass the
+   parameters to all the PCIe devices if application requires to configure on
+   all the ethdev ports.
diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index 4ff3609d2..d1c8871d8 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -29,9 +29,10 @@ LIBABIVER := 1
 #
 SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
otx2_mac.c  \
-   otx2_ethdev.c
+   otx2_ethdev.c   \
+   otx2_ethdev_devargs.c
 
 LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2 -lrte_eal
-LDLIBS += -lrte_ethdev -lrte_bus_pci
+LDLIBS += -lrte_ethdev -lrte_bus_pci -lrte_kvargs
 
 include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index b153f166d..b5c6fb978 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -5,6 +5,7 @@
 sources = files(
'otx2_mac.c',
'otx2_ethdev.c',
+   'otx2_ethdev_devargs.c'
)
 
 deps += ['bus_pci', 'common_octeontx2', 'mempool_octeontx2']
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 08f03b4c3..eeba0c2c6 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -137,6 +137,13 @@ otx2_eth_dev_init(struct rte_eth_dev *eth_dev)
memset(&dev->otx2_eth_dev_data_start, 0, sizeof(*dev) -
offsetof(struct otx2_eth_dev, otx2_eth_dev_data_start));
 
+   /* Parse devargs string */
+   rc = otx2_ethdev_parse_devargs(eth_dev->device->devargs, dev);
+   if (rc) {
+   otx2_err("Failed to parse devargs rc=%d", rc);
+   goto error;
+   }
+
if (!dev->mbox_active) {
/* Initialize the base otx2_dev object
 * only if already present
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/ne

[dpdk-dev] [PATCH v2 05/57] net/octeontx2: handle device error interrupts

[jerinj]

From: Jerin Jacob 

Handle device specific error and ras interrupts.

Signed-off-by: Jerin Jacob 
Signed-off-by: Nithin Dabilpuram 
Signed-off-by: Harman Kalra 
---
 drivers/net/octeontx2/Makefile  |   1 +
 drivers/net/octeontx2/meson.build   |   1 +
 drivers/net/octeontx2/otx2_ethdev.c |  12 +-
 drivers/net/octeontx2/otx2_ethdev.h |   4 +
 drivers/net/octeontx2/otx2_ethdev_irq.c | 140 
 5 files changed, 156 insertions(+), 2 deletions(-)
 create mode 100644 drivers/net/octeontx2/otx2_ethdev_irq.c

diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index d1c8871d8..54f8f268d 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -30,6 +30,7 @@ LIBABIVER := 1
 SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
otx2_mac.c  \
otx2_ethdev.c   \
+   otx2_ethdev_irq.c \
otx2_ethdev_devargs.c
 
 LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2 -lrte_eal
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index b5c6fb978..148f7d339 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -5,6 +5,7 @@
 sources = files(
'otx2_mac.c',
'otx2_ethdev.c',
+   'otx2_ethdev_irq.c',
'otx2_ethdev_devargs.c'
)
 
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index eeba0c2c6..67a7ebb36 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -175,12 +175,17 @@ otx2_eth_dev_init(struct rte_eth_dev *eth_dev)
if (rc)
goto otx2_npa_uninit;
 
+   /* Register LF irq handlers */
+   rc = otx2_nix_register_irqs(eth_dev);
+   if (rc)
+   goto mbox_detach;
+
/* Get maximum number of supported MAC entries */
max_entries = otx2_cgx_mac_max_entries_get(dev);
if (max_entries < 0) {
otx2_err("Failed to get max entries for mac addr");
rc = -ENOTSUP;
-   goto mbox_detach;
+   goto unregister_irq;
}
 
/* For VFs, returned max_entries will be 0. But to keep default MAC
@@ -194,7 +199,7 @@ otx2_eth_dev_init(struct rte_eth_dev *eth_dev)
if (eth_dev->data->mac_addrs == NULL) {
otx2_err("Failed to allocate memory for mac addr");
rc = -ENOMEM;
-   goto mbox_detach;
+   goto unregister_irq;
}
 
dev->max_mac_entries = max_entries;
@@ -226,6 +231,8 @@ otx2_eth_dev_init(struct rte_eth_dev *eth_dev)
 
 free_mac_addrs:
rte_free(eth_dev->data->mac_addrs);
+unregister_irq:
+   otx2_nix_unregister_irqs(eth_dev);
 mbox_detach:
otx2_eth_dev_lf_detach(dev->mbox);
 otx2_npa_uninit:
@@ -261,6 +268,7 @@ otx2_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool 
mbox_close)
dev->drv_inited = false;
 
pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
+   otx2_nix_unregister_irqs(eth_dev);
 
rc = otx2_eth_dev_lf_detach(dev->mbox);
if (rc)
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index a83688392..f7d8838df 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -105,6 +105,10 @@ otx2_eth_pmd_priv(struct rte_eth_dev *eth_dev)
return eth_dev->data->dev_private;
 }
 
+/* IRQ */
+int otx2_nix_register_irqs(struct rte_eth_dev *eth_dev);
+void otx2_nix_unregister_irqs(struct rte_eth_dev *eth_dev);
+
 /* CGX */
 int otx2_cgx_rxtx_start(struct otx2_eth_dev *dev);
 int otx2_cgx_rxtx_stop(struct otx2_eth_dev *dev);
diff --git a/drivers/net/octeontx2/otx2_ethdev_irq.c 
b/drivers/net/octeontx2/otx2_ethdev_irq.c
new file mode 100644
index 0..33fed93c4
--- /dev/null
+++ b/drivers/net/octeontx2/otx2_ethdev_irq.c
@@ -0,0 +1,140 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2019 Marvell International Ltd.
+ */
+
+#include 
+
+#include 
+
+#include "otx2_ethdev.h"
+
+static void
+nix_lf_err_irq(void *param)
+{
+   struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)param;
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+   uint64_t intr;
+
+   intr = otx2_read64(dev->base + NIX_LF_ERR_INT);
+   if (intr == 0)
+   return;
+
+   otx2_err("Err_intr=0x%" PRIx64 " pf=%d, vf=%d", intr, dev->pf, dev->vf);
+
+   /* Clear interrupt */
+   otx2_write64(intr, dev->base + NIX_LF_ERR_INT);
+}
+
+static int
+nix_lf_register_err_irq(struct rte_eth_dev *eth_dev)
+{
+   struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
+   struct rte_intr_handle *handle = &pci_dev->intr_handle;
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+   int rc, vec;
+
+   vec = dev->nix_msixoff + NIX_LF_INT_VEC_ERR_INT;
+
+   /* Clear err interrupt */
+   otx2_write64(~0ull, dev->base + NIX_LF_ERR_INT_ENA

[dpdk-dev] [PATCH v2 06/57] net/octeontx2: add info get operation

[jerinj]

From: Jerin Jacob 

Add device information get operation.

Signed-off-by: Jerin Jacob 
Signed-off-by: Vamsi Attunuru 
Signed-off-by: Harman Kalra 
---
 doc/guides/nics/features/octeontx2.ini |  4 ++
 doc/guides/nics/features/octeontx2_vec.ini |  4 ++
 doc/guides/nics/features/octeontx2_vf.ini  |  3 +
 doc/guides/nics/octeontx2.rst  |  2 +
 drivers/net/octeontx2/Makefile |  1 +
 drivers/net/octeontx2/meson.build  |  1 +
 drivers/net/octeontx2/otx2_ethdev.c|  7 +++
 drivers/net/octeontx2/otx2_ethdev.h| 45 +++
 drivers/net/octeontx2/otx2_ethdev_ops.c| 64 ++
 9 files changed, 131 insertions(+)
 create mode 100644 drivers/net/octeontx2/otx2_ethdev_ops.c

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index 84d5ad779..356b88de7 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -4,6 +4,10 @@
 ; Refer to default.ini for the full list of available PMD features.
 ;
 [Features]
+Speed capabilities   = Y
+Lock-free Tx queue   = Y
+SR-IOV   = Y
+Multiprocess aware   = Y
 Linux VFIO   = Y
 ARMv8= Y
 Usage doc= Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index 5fd7e4c5c..5f4eaa3f4 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -4,6 +4,10 @@
 ; Refer to default.ini for the full list of available PMD features.
 ;
 [Features]
+Speed capabilities   = Y
+Lock-free Tx queue   = Y
+SR-IOV   = Y
+Multiprocess aware   = Y
 Linux VFIO   = Y
 ARMv8= Y
 Usage doc= Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
index 3128cc120..024b032d4 100644
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -4,6 +4,9 @@
 ; Refer to default.ini for the full list of available PMD features.
 ;
 [Features]
+Speed capabilities   = Y
+Lock-free Tx queue   = Y
+Multiprocess aware   = Y
 Linux VFIO   = Y
 ARMv8= Y
 Usage doc= Y
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index 92a7ebc42..e3f4c2c43 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -16,6 +16,8 @@ Features
 
 Features of the OCTEON TX2 Ethdev PMD are:
 
+- SR-IOV VF
+- Lock-free Tx queue
 
 Prerequisites
 -
diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index 54f8f268d..5083637e4 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -31,6 +31,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
otx2_mac.c  \
otx2_ethdev.c   \
otx2_ethdev_irq.c \
+   otx2_ethdev_ops.c \
otx2_ethdev_devargs.c
 
 LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2 -lrte_eal
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index 148f7d339..aa8417e3f 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -6,6 +6,7 @@ sources = files(
'otx2_mac.c',
'otx2_ethdev.c',
'otx2_ethdev_irq.c',
+   'otx2_ethdev_ops.c',
'otx2_ethdev_devargs.c'
)
 
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 67a7ebb36..6e3c70559 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -64,6 +64,11 @@ nix_lf_free(struct otx2_eth_dev *dev)
return otx2_mbox_process(mbox);
 }
 
+/* Initialize and register driver with DPDK Application */
+static const struct eth_dev_ops otx2_eth_dev_ops = {
+   .dev_infos_get= otx2_nix_info_get,
+};
+
 static inline int
 nix_lf_attach(struct otx2_eth_dev *dev)
 {
@@ -120,6 +125,8 @@ otx2_eth_dev_init(struct rte_eth_dev *eth_dev)
struct rte_pci_device *pci_dev;
int rc, max_entries;
 
+   eth_dev->dev_ops = &otx2_eth_dev_ops;
+
/* For secondary processes, the primary has done all the work */
if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
/* Setup callbacks for secondary process */
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index f7d8838df..666ceba91 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -33,9 +33,50 @@
 /* Used for struct otx2_eth_dev::flags */
 #define OTX2_LINK_CFG_IN_PROGRESS_FBIT_ULL(0)
 
+/* VLAN tag inserted by NIX_TX_VTAG_ACTION.
+ * In Tx space is always reserved for this in FRS.
+ */
+#define NIX_MAX_VTAG_INS   2
+#define NIX_MAX_VTAG_ACT_SIZE  (4 * NIX_MAX_VTAG_INS)
+
+/* ETH_HLEN+ETH_FCS+2*VLAN_HLEN */
+#define NIX_L2_OVERHEAD \
+   (RTE_ETHER_HDR_LEN

[dpdk-dev] [PATCH v2 07/57] net/octeontx2: add device configure operation

[jerinj]

From: Jerin Jacob 

Add device configure operation. This would call lf_alloc
mailbox to allocate a NIX LF and upon return, AF will
return the attributes for the select LF.

Signed-off-by: Jerin Jacob 
Signed-off-by: Vamsi Attunuru 
Signed-off-by: Nithin Dabilpuram 
---
 drivers/net/octeontx2/otx2_ethdev.c | 151 
 drivers/net/octeontx2/otx2_ethdev.h |  11 ++
 2 files changed, 162 insertions(+)

diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 6e3c70559..65d72a47f 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -39,6 +39,52 @@ nix_get_tx_offload_capa(struct otx2_eth_dev *dev)
return NIX_TX_OFFLOAD_CAPA;
 }
 
+static int
+nix_lf_alloc(struct otx2_eth_dev *dev, uint32_t nb_rxq, uint32_t nb_txq)
+{
+   struct otx2_mbox *mbox = dev->mbox;
+   struct nix_lf_alloc_req *req;
+   struct nix_lf_alloc_rsp *rsp;
+   int rc;
+
+   req = otx2_mbox_alloc_msg_nix_lf_alloc(mbox);
+   req->rq_cnt = nb_rxq;
+   req->sq_cnt = nb_txq;
+   req->cq_cnt = nb_rxq;
+   /* XQE_SZ should be in Sync with NIX_CQ_ENTRY_SZ */
+   RTE_BUILD_BUG_ON(NIX_CQ_ENTRY_SZ != 128);
+   req->xqe_sz = NIX_XQESZ_W16;
+   req->rss_sz = dev->rss_info.rss_size;
+   req->rss_grps = NIX_RSS_GRPS;
+   req->npa_func = otx2_npa_pf_func_get();
+   req->sso_func = otx2_sso_pf_func_get();
+   req->rx_cfg = BIT_ULL(35 /* DIS_APAD */);
+   if (dev->rx_offloads & (DEV_RX_OFFLOAD_TCP_CKSUM |
+DEV_RX_OFFLOAD_UDP_CKSUM)) {
+   req->rx_cfg |= BIT_ULL(37 /* CSUM_OL4 */);
+   req->rx_cfg |= BIT_ULL(36 /* CSUM_IL4 */);
+   }
+
+   rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
+   if (rc)
+   return rc;
+
+   dev->sqb_size = rsp->sqb_size;
+   dev->tx_chan_base = rsp->tx_chan_base;
+   dev->rx_chan_base = rsp->rx_chan_base;
+   dev->rx_chan_cnt = rsp->rx_chan_cnt;
+   dev->tx_chan_cnt = rsp->tx_chan_cnt;
+   dev->lso_tsov4_idx = rsp->lso_tsov4_idx;
+   dev->lso_tsov6_idx = rsp->lso_tsov6_idx;
+   dev->lf_tx_stats = rsp->lf_tx_stats;
+   dev->lf_rx_stats = rsp->lf_rx_stats;
+   dev->cints = rsp->cints;
+   dev->qints = rsp->qints;
+   dev->npc_flow.channel = dev->rx_chan_base;
+
+   return 0;
+}
+
 static int
 nix_lf_free(struct otx2_eth_dev *dev)
 {
@@ -64,9 +110,114 @@ nix_lf_free(struct otx2_eth_dev *dev)
return otx2_mbox_process(mbox);
 }
 
+static int
+otx2_nix_configure(struct rte_eth_dev *eth_dev)
+{
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+   struct rte_eth_dev_data *data = eth_dev->data;
+   struct rte_eth_conf *conf = &data->dev_conf;
+   struct rte_eth_rxmode *rxmode = &conf->rxmode;
+   struct rte_eth_txmode *txmode = &conf->txmode;
+   char ea_fmt[RTE_ETHER_ADDR_FMT_SIZE];
+   struct rte_ether_addr *ea;
+   uint8_t nb_rxq, nb_txq;
+   int rc;
+
+   rc = -EINVAL;
+
+   /* Sanity checks */
+   if (rte_eal_has_hugepages() == 0) {
+   otx2_err("Huge page is not configured");
+   goto fail;
+   }
+
+   if (rte_eal_iova_mode() != RTE_IOVA_VA) {
+   otx2_err("iova mode should be va");
+   goto fail;
+   }
+
+   if (conf->link_speeds & ETH_LINK_SPEED_FIXED) {
+   otx2_err("Setting link speed/duplex not supported");
+   goto fail;
+   }
+
+   if (conf->dcb_capability_en == 1) {
+   otx2_err("dcb enable is not supported");
+   goto fail;
+   }
+
+   if (conf->fdir_conf.mode != RTE_FDIR_MODE_NONE) {
+   otx2_err("Flow director is not supported");
+   goto fail;
+   }
+
+   if (rxmode->mq_mode != ETH_MQ_RX_NONE &&
+   rxmode->mq_mode != ETH_MQ_RX_RSS) {
+   otx2_err("Unsupported mq rx mode %d", rxmode->mq_mode);
+   goto fail;
+   }
+
+   if (txmode->mq_mode != ETH_MQ_TX_NONE) {
+   otx2_err("Unsupported mq tx mode %d", txmode->mq_mode);
+   goto fail;
+   }
+
+   /* Free the resources allocated from the previous configure */
+   if (dev->configured == 1)
+   nix_lf_free(dev);
+
+   if (otx2_dev_is_A0(dev) &&
+   (txmode->offloads & DEV_TX_OFFLOAD_SCTP_CKSUM) &&
+   ((txmode->offloads & DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM) ||
+   (txmode->offloads & DEV_TX_OFFLOAD_OUTER_UDP_CKSUM))) {
+   otx2_err("Outer IP and SCTP checksum unsupported");
+   rc = -EINVAL;
+   goto fail;
+   }
+
+   dev->rx_offloads = rxmode->offloads;
+   dev->tx_offloads = txmode->offloads;
+   dev->rss_info.rss_grps = NIX_RSS_GRPS;
+
+   nb_rxq = RTE_MAX(data->nb_rx_queues, 1);
+   nb_txq = RTE_MAX(data->nb_tx_queues, 1);
+
+   /* Alloc a nix lf */
+   rc = nix_lf_alloc(dev, nb_rxq

[dpdk-dev] [PATCH v2 10/57] net/octeontx2: add register dump support

[jerinj]

From: Kiran Kumar K 

Add register dump support and mark Registers dump in features.

Signed-off-by: Kiran Kumar K 
Signed-off-by: Jerin Jacob 
---
 doc/guides/nics/features/octeontx2.ini |   1 +
 doc/guides/nics/features/octeontx2_vec.ini |   1 +
 doc/guides/nics/features/octeontx2_vf.ini  |   1 +
 drivers/net/octeontx2/otx2_ethdev.c|   1 +
 drivers/net/octeontx2/otx2_ethdev.h|   3 +
 drivers/net/octeontx2/otx2_ethdev_debug.c  | 228 +
 drivers/net/octeontx2/otx2_ethdev_irq.c|   6 +
 7 files changed, 241 insertions(+)

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index 356b88de7..7d53bf0e7 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -8,6 +8,7 @@ Speed capabilities   = Y
 Lock-free Tx queue   = Y
 SR-IOV   = Y
 Multiprocess aware   = Y
+Registers dump   = Y
 Linux VFIO   = Y
 ARMv8= Y
 Usage doc= Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index 5f4eaa3f4..e0cc7b22d 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -8,6 +8,7 @@ Speed capabilities   = Y
 Lock-free Tx queue   = Y
 SR-IOV   = Y
 Multiprocess aware   = Y
+Registers dump   = Y
 Linux VFIO   = Y
 ARMv8= Y
 Usage doc= Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
index 024b032d4..6dfdf88c6 100644
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -7,6 +7,7 @@
 Speed capabilities   = Y
 Lock-free Tx queue   = Y
 Multiprocess aware   = Y
+Registers dump   = Y
 Linux VFIO   = Y
 ARMv8= Y
 Usage doc= Y
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 045855c2e..48d5a15d6 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -229,6 +229,7 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
 static const struct eth_dev_ops otx2_eth_dev_ops = {
.dev_infos_get= otx2_nix_info_get,
.dev_configure= otx2_nix_configure,
+   .get_reg  = otx2_nix_dev_get_reg,
 };
 
 static inline int
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 7c0bef28e..7313689b0 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -175,6 +175,9 @@ void otx2_nix_unregister_irqs(struct rte_eth_dev *eth_dev);
 void oxt2_nix_unregister_queue_irqs(struct rte_eth_dev *eth_dev);
 
 /* Debug */
+int otx2_nix_reg_dump(struct otx2_eth_dev *dev, uint64_t *data);
+int otx2_nix_dev_get_reg(struct rte_eth_dev *eth_dev,
+struct rte_dev_reg_info *regs);
 int otx2_nix_queues_ctx_dump(struct rte_eth_dev *eth_dev);
 void otx2_nix_cqe_dump(const struct nix_cqe_hdr_s *cq);
 
diff --git a/drivers/net/octeontx2/otx2_ethdev_debug.c 
b/drivers/net/octeontx2/otx2_ethdev_debug.c
index 39cda7637..9f06e5505 100644
--- a/drivers/net/octeontx2/otx2_ethdev_debug.c
+++ b/drivers/net/octeontx2/otx2_ethdev_debug.c
@@ -5,6 +5,234 @@
 #include "otx2_ethdev.h"
 
 #define nix_dump(fmt, ...) fprintf(stderr, fmt "\n", ##__VA_ARGS__)
+#define NIX_REG_INFO(reg) {reg, #reg}
+
+struct nix_lf_reg_info {
+   uint32_t offset;
+   const char *name;
+};
+
+static const struct
+nix_lf_reg_info nix_lf_reg[] = {
+   NIX_REG_INFO(NIX_LF_RX_SECRETX(0)),
+   NIX_REG_INFO(NIX_LF_RX_SECRETX(1)),
+   NIX_REG_INFO(NIX_LF_RX_SECRETX(2)),
+   NIX_REG_INFO(NIX_LF_RX_SECRETX(3)),
+   NIX_REG_INFO(NIX_LF_RX_SECRETX(4)),
+   NIX_REG_INFO(NIX_LF_RX_SECRETX(5)),
+   NIX_REG_INFO(NIX_LF_CFG),
+   NIX_REG_INFO(NIX_LF_GINT),
+   NIX_REG_INFO(NIX_LF_GINT_W1S),
+   NIX_REG_INFO(NIX_LF_GINT_ENA_W1C),
+   NIX_REG_INFO(NIX_LF_GINT_ENA_W1S),
+   NIX_REG_INFO(NIX_LF_ERR_INT),
+   NIX_REG_INFO(NIX_LF_ERR_INT_W1S),
+   NIX_REG_INFO(NIX_LF_ERR_INT_ENA_W1C),
+   NIX_REG_INFO(NIX_LF_ERR_INT_ENA_W1S),
+   NIX_REG_INFO(NIX_LF_RAS),
+   NIX_REG_INFO(NIX_LF_RAS_W1S),
+   NIX_REG_INFO(NIX_LF_RAS_ENA_W1C),
+   NIX_REG_INFO(NIX_LF_RAS_ENA_W1S),
+   NIX_REG_INFO(NIX_LF_SQ_OP_ERR_DBG),
+   NIX_REG_INFO(NIX_LF_MNQ_ERR_DBG),
+   NIX_REG_INFO(NIX_LF_SEND_ERR_DBG),
+};
+
+static int
+nix_lf_get_reg_count(struct otx2_eth_dev *dev)
+{
+   int reg_count = 0;
+
+   reg_count = RTE_DIM(nix_lf_reg);
+   /* NIX_LF_TX_STATX */
+   reg_count += dev->lf_tx_stats;
+   /* NIX_LF_RX_STATX */
+   reg_count += dev->lf_rx_stats;
+   /* NIX_LF_QINTX_CNT*/
+   reg_count += dev->qints;
+   /* NIX_LF_QINTX_INT */
+   reg_count += dev->qints;
+   /* NIX_LF_QINTX_ENA_W1S */
+   reg_count += dev->qints;
+ 

[dpdk-dev] [PATCH v2 08/57] net/octeontx2: handle queue specific error interrupts

[jerinj]

From: Jerin Jacob 

Handle queue specific error interrupts.

Signed-off-by: Jerin Jacob 
Signed-off-by: Nithin Dabilpuram 
---
 doc/guides/nics/octeontx2.rst   |   1 +
 drivers/net/octeontx2/otx2_ethdev.c |  16 +-
 drivers/net/octeontx2/otx2_ethdev.h |   9 ++
 drivers/net/octeontx2/otx2_ethdev_irq.c | 191 
 4 files changed, 216 insertions(+), 1 deletion(-)

diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index e3f4c2c43..50e825968 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -18,6 +18,7 @@ Features of the OCTEON TX2 Ethdev PMD are:
 
 - SR-IOV VF
 - Lock-free Tx queue
+- Debug utilities - error interrupt support
 
 Prerequisites
 -
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 65d72a47f..045855c2e 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -163,8 +163,10 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
}
 
/* Free the resources allocated from the previous configure */
-   if (dev->configured == 1)
+   if (dev->configured == 1) {
+   oxt2_nix_unregister_queue_irqs(eth_dev);
nix_lf_free(dev);
+   }
 
if (otx2_dev_is_A0(dev) &&
(txmode->offloads & DEV_TX_OFFLOAD_SCTP_CKSUM) &&
@@ -189,6 +191,13 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
goto fail;
}
 
+   /* Register queue IRQs */
+   rc = oxt2_nix_register_queue_irqs(eth_dev);
+   if (rc) {
+   otx2_err("Failed to register queue interrupts rc=%d", rc);
+   goto free_nix_lf;
+   }
+
/* Update the mac address */
ea = eth_dev->data->mac_addrs;
memcpy(ea, dev->mac_addr, RTE_ETHER_ADDR_LEN);
@@ -210,6 +219,8 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
dev->configured_nb_tx_qs = data->nb_tx_queues;
return 0;
 
+free_nix_lf:
+   rc = nix_lf_free(dev);
 fail:
return rc;
 }
@@ -413,6 +424,9 @@ otx2_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool 
mbox_close)
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
 
+   /* Unregister queue irqs */
+   oxt2_nix_unregister_queue_irqs(eth_dev);
+
rc = nix_lf_free(dev);
if (rc)
otx2_err("Failed to free nix lf, rc=%d", rc);
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index c1528e2ac..d9cdd33b5 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -106,6 +106,11 @@
DEV_RX_OFFLOAD_QINQ_STRIP | \
DEV_RX_OFFLOAD_TIMESTAMP)
 
+struct otx2_qint {
+   struct rte_eth_dev *eth_dev;
+   uint8_t qintx;
+};
+
 struct otx2_rss_info {
uint16_t rss_size;
uint8_t rss_grps;
@@ -134,6 +139,7 @@ struct otx2_eth_dev {
uint16_t cints;
uint16_t qints;
uint8_t configured;
+   uint8_t configured_qints;
uint8_t configured_nb_rx_qs;
uint8_t configured_nb_tx_qs;
uint16_t nix_msixoff;
@@ -147,6 +153,7 @@ struct otx2_eth_dev {
uint64_t tx_offloads;
uint64_t rx_offload_capa;
uint64_t tx_offload_capa;
+   struct otx2_qint qints_mem[RTE_MAX_QUEUES_PER_PORT];
struct otx2_rss_info rss_info;
struct otx2_npc_flow_info npc_flow;
 } __rte_cache_aligned;
@@ -163,7 +170,9 @@ void otx2_nix_info_get(struct rte_eth_dev *eth_dev,
 
 /* IRQ */
 int otx2_nix_register_irqs(struct rte_eth_dev *eth_dev);
+int oxt2_nix_register_queue_irqs(struct rte_eth_dev *eth_dev);
 void otx2_nix_unregister_irqs(struct rte_eth_dev *eth_dev);
+void oxt2_nix_unregister_queue_irqs(struct rte_eth_dev *eth_dev);
 
 /* CGX */
 int otx2_cgx_rxtx_start(struct otx2_eth_dev *dev);
diff --git a/drivers/net/octeontx2/otx2_ethdev_irq.c 
b/drivers/net/octeontx2/otx2_ethdev_irq.c
index 33fed93c4..476c7ea78 100644
--- a/drivers/net/octeontx2/otx2_ethdev_irq.c
+++ b/drivers/net/octeontx2/otx2_ethdev_irq.c
@@ -112,6 +112,197 @@ nix_lf_unregister_ras_irq(struct rte_eth_dev *eth_dev)
otx2_unregister_irq(handle, nix_lf_ras_irq, eth_dev, vec);
 }
 
+static inline uint8_t
+nix_lf_q_irq_get_and_clear(struct otx2_eth_dev *dev, uint16_t q,
+  uint32_t off, uint64_t mask)
+{
+   uint64_t reg, wdata;
+   uint8_t qint;
+
+   wdata = (uint64_t)q << 44;
+   reg = otx2_atomic64_add_nosync(wdata, (int64_t *)(dev->base + off));
+
+   if (reg & BIT_ULL(42) /* OP_ERR */) {
+   otx2_err("Failed execute irq get off=0x%x", off);
+   return 0;
+   }
+
+   qint = reg & 0xff;
+   wdata &= mask;
+   otx2_write64(wdata, dev->base + off);
+
+   return qint;
+}
+
+static inline uint8_t
+nix_lf_rq_irq_get_and_clear(struct otx2_eth_dev *dev, uint16_t rq)
+{
+   return nix_lf_q_irq_get_and_clear(dev, rq, NIX_LF_RQ_OP_INT, ~0xff00);
+}
+
+

[dpdk-dev] [PATCH v2 09/57] net/octeontx2: add context debug utils

[jerinj]

From: Jerin Jacob 

Add RQ,SQ,CQ context and CQE structure dump utils.

Signed-off-by: Jerin Jacob 
Signed-off-by: Vivek Sharma 
---
 doc/guides/nics/octeontx2.rst |   2 +-
 drivers/net/octeontx2/Makefile|   1 +
 drivers/net/octeontx2/meson.build |   1 +
 drivers/net/octeontx2/otx2_ethdev.h   |   4 +
 drivers/net/octeontx2/otx2_ethdev_debug.c | 272 ++
 drivers/net/octeontx2/otx2_ethdev_irq.c   |   6 +
 6 files changed, 285 insertions(+), 1 deletion(-)
 create mode 100644 drivers/net/octeontx2/otx2_ethdev_debug.c

diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index 50e825968..75d5746e8 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -18,7 +18,7 @@ Features of the OCTEON TX2 Ethdev PMD are:
 
 - SR-IOV VF
 - Lock-free Tx queue
-- Debug utilities - error interrupt support
+- Debug utilities - Context dump and error interrupt support
 
 Prerequisites
 -
diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index 5083637e4..c6e24a535 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -32,6 +32,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
otx2_ethdev.c   \
otx2_ethdev_irq.c \
otx2_ethdev_ops.c \
+   otx2_ethdev_debug.c \
otx2_ethdev_devargs.c
 
 LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2 -lrte_eal
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index aa8417e3f..a06e1192c 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -7,6 +7,7 @@ sources = files(
'otx2_ethdev.c',
'otx2_ethdev_irq.c',
'otx2_ethdev_ops.c',
+   'otx2_ethdev_debug.c',
'otx2_ethdev_devargs.c'
)
 
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index d9cdd33b5..7c0bef28e 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -174,6 +174,10 @@ int oxt2_nix_register_queue_irqs(struct rte_eth_dev 
*eth_dev);
 void otx2_nix_unregister_irqs(struct rte_eth_dev *eth_dev);
 void oxt2_nix_unregister_queue_irqs(struct rte_eth_dev *eth_dev);
 
+/* Debug */
+int otx2_nix_queues_ctx_dump(struct rte_eth_dev *eth_dev);
+void otx2_nix_cqe_dump(const struct nix_cqe_hdr_s *cq);
+
 /* CGX */
 int otx2_cgx_rxtx_start(struct otx2_eth_dev *dev);
 int otx2_cgx_rxtx_stop(struct otx2_eth_dev *dev);
diff --git a/drivers/net/octeontx2/otx2_ethdev_debug.c 
b/drivers/net/octeontx2/otx2_ethdev_debug.c
new file mode 100644
index 0..39cda7637
--- /dev/null
+++ b/drivers/net/octeontx2/otx2_ethdev_debug.c
@@ -0,0 +1,272 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2019 Marvell International Ltd.
+ */
+
+#include "otx2_ethdev.h"
+
+#define nix_dump(fmt, ...) fprintf(stderr, fmt "\n", ##__VA_ARGS__)
+
+static inline void
+nix_lf_sq_dump(struct  nix_sq_ctx_s *ctx)
+{
+   nix_dump("W0: sqe_way_mask \t\t%d\nW0: cq \t\t\t\t%d",
+ctx->sqe_way_mask, ctx->cq);
+   nix_dump("W0: sdp_mcast \t\t\t%d\nW0: substream \t\t\t0x%03x",
+ctx->sdp_mcast, ctx->substream);
+   nix_dump("W0: qint_idx \t\t\t%d\nW0: ena \t\t\t%d\n",
+ctx->qint_idx, ctx->ena);
+
+   nix_dump("W1: sqb_count \t\t\t%d\nW1: default_chan \t\t%d",
+ctx->sqb_count, ctx->default_chan);
+   nix_dump("W1: smq_rr_quantum \t\t%d\nW1: sso_ena \t\t\t%d",
+ctx->smq_rr_quantum, ctx->sso_ena);
+   nix_dump("W1: xoff \t\t\t%d\nW1: cq_ena \t\t\t%d\nW1: smq\t\t\t\t%d\n",
+ctx->xoff, ctx->cq_ena, ctx->smq);
+
+   nix_dump("W2: sqe_stype \t\t\t%d\nW2: sq_int_ena \t\t\t%d",
+ctx->sqe_stype, ctx->sq_int_ena);
+   nix_dump("W2: sq_int  \t\t\t%d\nW2: sqb_aura \t\t\t%d",
+ctx->sq_int, ctx->sqb_aura);
+   nix_dump("W2: smq_rr_count \t\t%d\n",  ctx->smq_rr_count);
+
+   nix_dump("W3: smq_next_sq_vld\t\t%d\nW3: smq_pend\t\t\t%d",
+ctx->smq_next_sq_vld, ctx->smq_pend);
+   nix_dump("W3: smenq_next_sqb_vld  \t%d\nW3: head_offset\t\t\t%d",
+ctx->smenq_next_sqb_vld, ctx->head_offset);
+   nix_dump("W3: smenq_offset\t\t%d\nW3: tail_offset \t\t%d",
+ctx->smenq_offset, ctx->tail_offset);
+   nix_dump("W3: smq_lso_segnum \t\t%d\nW3: smq_next_sq \t\t%d",
+ctx->smq_lso_segnum, ctx->smq_next_sq);
+   nix_dump("W3: mnq_dis \t\t\t%d\nW3: lmt_dis \t\t\t%d",
+ctx->mnq_dis, ctx->lmt_dis);
+   nix_dump("W3: cq_limit\t\t\t%d\nW3: max_sqe_size\t\t%d\n",
+ctx->cq_limit, ctx->max_sqe_size);
+
+   nix_dump("W4: next_sqb \t\t\t0x%" PRIx64 "", ctx->next_sqb);
+   nix_dump("W5: tail_sqb \t\t\t0x%" PRIx64 "", ctx->tail_sqb);
+   nix_dump("W6: smenq_sqb \t\t\t0x%" PRIx64 "", ctx->smenq_

[dpdk-dev] [PATCH v2 11/57] net/octeontx2: add link stats operations

[jerinj]

From: Vamsi Attunuru 

Add link stats related operations and mark respective
items in the documentation.

Signed-off-by: Vamsi Attunuru 
Signed-off-by: Nithin Dabilpuram 
---
 doc/guides/nics/features/octeontx2.ini |   2 +
 doc/guides/nics/features/octeontx2_vec.ini |   2 +
 doc/guides/nics/features/octeontx2_vf.ini  |   2 +
 doc/guides/nics/octeontx2.rst  |   1 +
 drivers/net/octeontx2/Makefile |   1 +
 drivers/net/octeontx2/meson.build  |   1 +
 drivers/net/octeontx2/otx2_ethdev.c|   8 ++
 drivers/net/octeontx2/otx2_ethdev.h|   8 ++
 drivers/net/octeontx2/otx2_link.c  | 108 +
 9 files changed, 133 insertions(+)
 create mode 100644 drivers/net/octeontx2/otx2_link.c

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index 7d53bf0e7..828351409 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -8,6 +8,8 @@ Speed capabilities   = Y
 Lock-free Tx queue   = Y
 SR-IOV   = Y
 Multiprocess aware   = Y
+Link status  = Y
+Link status event= Y
 Registers dump   = Y
 Linux VFIO   = Y
 ARMv8= Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index e0cc7b22d..719692dc6 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -8,6 +8,8 @@ Speed capabilities   = Y
 Lock-free Tx queue   = Y
 SR-IOV   = Y
 Multiprocess aware   = Y
+Link status  = Y
+Link status event= Y
 Registers dump   = Y
 Linux VFIO   = Y
 ARMv8= Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
index 6dfdf88c6..4d5667583 100644
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -7,6 +7,8 @@
 Speed capabilities   = Y
 Lock-free Tx queue   = Y
 Multiprocess aware   = Y
+Link status  = Y
+Link status event= Y
 Registers dump   = Y
 Linux VFIO   = Y
 ARMv8= Y
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index 75d5746e8..a163f9128 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -18,6 +18,7 @@ Features of the OCTEON TX2 Ethdev PMD are:
 
 - SR-IOV VF
 - Lock-free Tx queue
+- Link state information
 - Debug utilities - Context dump and error interrupt support
 
 Prerequisites
diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index c6e24a535..2dfb5043d 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -29,6 +29,7 @@ LIBABIVER := 1
 #
 SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
otx2_mac.c  \
+   otx2_link.c \
otx2_ethdev.c   \
otx2_ethdev_irq.c \
otx2_ethdev_ops.c \
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index a06e1192c..d693386b9 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -4,6 +4,7 @@
 
 sources = files(
'otx2_mac.c',
+   'otx2_link.c',
'otx2_ethdev.c',
'otx2_ethdev_irq.c',
'otx2_ethdev_ops.c',
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 48d5a15d6..cb4f6ebb9 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -39,6 +39,10 @@ nix_get_tx_offload_capa(struct otx2_eth_dev *dev)
return NIX_TX_OFFLOAD_CAPA;
 }
 
+static const struct otx2_dev_ops otx2_dev_ops = {
+   .link_status_update = otx2_eth_dev_link_status_update,
+};
+
 static int
 nix_lf_alloc(struct otx2_eth_dev *dev, uint32_t nb_rxq, uint32_t nb_txq)
 {
@@ -229,6 +233,7 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
 static const struct eth_dev_ops otx2_eth_dev_ops = {
.dev_infos_get= otx2_nix_info_get,
.dev_configure= otx2_nix_configure,
+   .link_update  = otx2_nix_link_update,
.get_reg  = otx2_nix_dev_get_reg,
 };
 
@@ -324,6 +329,9 @@ otx2_eth_dev_init(struct rte_eth_dev *eth_dev)
goto error;
}
}
+   /* Device generic callbacks */
+   dev->ops = &otx2_dev_ops;
+   dev->eth_dev = eth_dev;
 
/* Grab the NPA LF if required */
rc = otx2_npa_lf_init(pci_dev, dev);
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 7313689b0..d8490337d 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -136,6 +136,7 @@ struct otx2_eth_dev {
uint8_t max_mac_entries;
uint8_t lf_tx_stats;
uint8_t lf_rx_stats;
+   uint16_t flags;
uint16_t cints;
uint16_t qints;
uint8_t configured;
@@ -156,

[dpdk-dev] [PATCH v2 13/57] net/octeontx2: add extended stats operations

[jerinj]

From: Kiran Kumar K 

Add extended operations and updated the feature list.

Signed-off-by: Kiran Kumar K 
Signed-off-by: Vamsi Attunuru 
---
 doc/guides/nics/features/octeontx2.ini |   1 +
 doc/guides/nics/features/octeontx2_vec.ini |   1 +
 doc/guides/nics/features/octeontx2_vf.ini  |   1 +
 drivers/net/octeontx2/otx2_ethdev.c|   5 +
 drivers/net/octeontx2/otx2_ethdev.h|  13 +
 drivers/net/octeontx2/otx2_stats.c | 270 +
 6 files changed, 291 insertions(+)

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index 557107016..8d7c3588c 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -12,6 +12,7 @@ Link status  = Y
 Link status event= Y
 Basic stats  = Y
 Stats per queue  = Y
+Extended stats   = Y
 Registers dump   = Y
 Linux VFIO   = Y
 ARMv8= Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index 3a2b78e06..a6e6876fa 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -11,6 +11,7 @@ Multiprocess aware   = Y
 Link status  = Y
 Link status event= Y
 Basic stats  = Y
+Extended stats   = Y
 Stats per queue  = Y
 Registers dump   = Y
 Linux VFIO   = Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
index 499f66c5c..6ec83e823 100644
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -10,6 +10,7 @@ Multiprocess aware   = Y
 Link status  = Y
 Link status event= Y
 Basic stats  = Y
+Extended stats   = Y
 Stats per queue  = Y
 Registers dump   = Y
 Linux VFIO   = Y
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 5787029d9..937ba6399 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -238,6 +238,11 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.stats_reset  = otx2_nix_dev_stats_reset,
.get_reg  = otx2_nix_dev_get_reg,
.queue_stats_mapping_set  = otx2_nix_queue_stats_mapping,
+   .xstats_get   = otx2_nix_xstats_get,
+   .xstats_get_names = otx2_nix_xstats_get_names,
+   .xstats_reset = otx2_nix_xstats_reset,
+   .xstats_get_by_id = otx2_nix_xstats_get_by_id,
+   .xstats_get_names_by_id   = otx2_nix_xstats_get_names_by_id,
 };
 
 static inline int
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 1cd9893a6..7d53a6643 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -205,6 +205,19 @@ void otx2_nix_dev_stats_reset(struct rte_eth_dev *eth_dev);
 int otx2_nix_queue_stats_mapping(struct rte_eth_dev *dev,
 uint16_t queue_id, uint8_t stat_idx,
 uint8_t is_rx);
+int otx2_nix_xstats_get(struct rte_eth_dev *eth_dev,
+   struct rte_eth_xstat *xstats, unsigned int n);
+int otx2_nix_xstats_get_names(struct rte_eth_dev *eth_dev,
+ struct rte_eth_xstat_name *xstats_names,
+ unsigned int limit);
+void otx2_nix_xstats_reset(struct rte_eth_dev *eth_dev);
+
+int otx2_nix_xstats_get_by_id(struct rte_eth_dev *eth_dev,
+ const uint64_t *ids,
+ uint64_t *values, unsigned int n);
+int otx2_nix_xstats_get_names_by_id(struct rte_eth_dev *eth_dev,
+   struct rte_eth_xstat_name *xstats_names,
+   const uint64_t *ids, unsigned int limit);
 
 /* CGX */
 int otx2_cgx_rxtx_start(struct otx2_eth_dev *dev);
diff --git a/drivers/net/octeontx2/otx2_stats.c 
b/drivers/net/octeontx2/otx2_stats.c
index ade0f6ad6..deb83b704 100644
--- a/drivers/net/octeontx2/otx2_stats.c
+++ b/drivers/net/octeontx2/otx2_stats.c
@@ -6,6 +6,45 @@
 
 #include "otx2_ethdev.h"
 
+struct otx2_nix_xstats_name {
+   char name[RTE_ETH_XSTATS_NAME_SIZE];
+   uint32_t offset;
+};
+
+static const struct otx2_nix_xstats_name nix_tx_xstats[] = {
+   {"tx_ucast", NIX_STAT_LF_TX_TX_UCAST},
+   {"tx_bcast", NIX_STAT_LF_TX_TX_BCAST},
+   {"tx_mcast", NIX_STAT_LF_TX_TX_MCAST},
+   {"tx_drop", NIX_STAT_LF_TX_TX_DROP},
+   {"tx_octs", NIX_STAT_LF_TX_TX_OCTS},
+};
+
+static const struct otx2_nix_xstats_name nix_rx_xstats[] = {
+   {"rx_octs", NIX_STAT_LF_RX_RX_OCTS},
+   {"rx_ucast", NIX_STAT_LF_RX_RX_UCAST},
+   {"rx_bcast", NIX_STAT_LF_RX_RX_BCAST},
+   {"rx_mcast", NIX_STAT_LF_RX_RX_MCAST},
+   {"rx_drop", NIX_STAT_LF_RX_RX_DROP},
+   {"rx_drop_octs", NIX_STAT_LF_RX_RX_DROP_OCTS},
+   {"rx_fcs", NIX_STAT_LF_R

[dpdk-dev] [PATCH v2 15/57] net/octeontx2: add unicast MAC filter

[jerinj]

From: Sunil Kumar Kori 

Add unicast MAC filter for PF device and
update the respective feature list.

Signed-off-by: Sunil Kumar Kori 
Signed-off-by: Vamsi Attunuru 
---
 doc/guides/nics/features/octeontx2.ini |  1 +
 doc/guides/nics/features/octeontx2_vec.ini |  1 +
 doc/guides/nics/octeontx2.rst  |  1 +
 drivers/net/octeontx2/otx2_ethdev.c|  3 +
 drivers/net/octeontx2/otx2_ethdev.h|  6 ++
 drivers/net/octeontx2/otx2_mac.c   | 77 ++
 6 files changed, 89 insertions(+)

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index 9f682609d..566496113 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -12,6 +12,7 @@ Link status  = Y
 Link status event= Y
 Promiscuous mode = Y
 Allmulticast mode= Y
+Unicast MAC filter   = Y
 Basic stats  = Y
 Stats per queue  = Y
 Extended stats   = Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index 764e95ce6..195a48940 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -12,6 +12,7 @@ Link status  = Y
 Link status event= Y
 Promiscuous mode = Y
 Allmulticast mode= Y
+Unicast MAC filter   = Y
 Basic stats  = Y
 Extended stats   = Y
 Stats per queue  = Y
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index 9ef7be08f..8385c9c18 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -19,6 +19,7 @@ Features of the OCTEON TX2 Ethdev PMD are:
 - Promiscuous mode
 - SR-IOV VF
 - Lock-free Tx queue
+- MAC filtering
 - Port hardware statistics
 - Link state information
 - Debug utilities - Context dump and error interrupt support
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 826ce7f4e..a72c901f4 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -237,6 +237,9 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.stats_get= otx2_nix_dev_stats_get,
.stats_reset  = otx2_nix_dev_stats_reset,
.get_reg  = otx2_nix_dev_get_reg,
+   .mac_addr_add = otx2_nix_mac_addr_add,
+   .mac_addr_remove  = otx2_nix_mac_addr_del,
+   .mac_addr_set = otx2_nix_mac_addr_set,
.promiscuous_enable   = otx2_nix_promisc_enable,
.promiscuous_disable  = otx2_nix_promisc_disable,
.allmulticast_enable  = otx2_nix_allmulticast_enable,
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 814fd6ec3..56517845b 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -232,7 +232,13 @@ int otx2_cgx_mac_addr_set(struct rte_eth_dev *eth_dev,
  struct rte_ether_addr *addr);
 
 /* Mac address handling */
+int otx2_nix_mac_addr_set(struct rte_eth_dev *eth_dev,
+ struct rte_ether_addr *addr);
 int otx2_nix_mac_addr_get(struct rte_eth_dev *eth_dev, uint8_t *addr);
+int otx2_nix_mac_addr_add(struct rte_eth_dev *eth_dev,
+ struct rte_ether_addr *addr,
+ uint32_t index, uint32_t pool);
+void otx2_nix_mac_addr_del(struct rte_eth_dev *eth_dev, uint32_t index);
 int otx2_cgx_mac_max_entries_get(struct otx2_eth_dev *dev);
 
 /* Devargs */
diff --git a/drivers/net/octeontx2/otx2_mac.c b/drivers/net/octeontx2/otx2_mac.c
index 89b0ca6b0..b4bcc61f8 100644
--- a/drivers/net/octeontx2/otx2_mac.c
+++ b/drivers/net/octeontx2/otx2_mac.c
@@ -49,6 +49,83 @@ otx2_cgx_mac_max_entries_get(struct otx2_eth_dev *dev)
return rsp->max_dmac_filters;
 }
 
+int
+otx2_nix_mac_addr_add(struct rte_eth_dev *eth_dev, struct rte_ether_addr *addr,
+ uint32_t index __rte_unused, uint32_t pool __rte_unused)
+{
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+   struct otx2_mbox *mbox = dev->mbox;
+   struct cgx_mac_addr_add_req *req;
+   struct cgx_mac_addr_add_rsp *rsp;
+   int rc;
+
+   if (otx2_dev_is_vf(dev))
+   return -ENOTSUP;
+
+   if (otx2_dev_active_vfs(dev))
+   return -ENOTSUP;
+
+   req = otx2_mbox_alloc_msg_cgx_mac_addr_add(mbox);
+   otx2_mbox_memcpy(req->mac_addr, addr->addr_bytes, RTE_ETHER_ADDR_LEN);
+
+   rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
+   if (rc) {
+   otx2_err("Failed to add mac address, rc=%d", rc);
+   goto done;
+   }
+
+   /* Enable promiscuous mode at NIX level */
+   otx2_nix_promisc_config(eth_dev, 1);
+
+done:
+   return rc;
+}
+
+void
+otx2_nix_mac_addr_del(struct rte_eth_dev *eth_dev, uint32_t index)
+{
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+   struct otx2

[dpdk-dev] [PATCH v2 12/57] net/octeontx2: add basic stats operation

[jerinj]

From: Kiran Kumar K 

Add basic stat operation and updated the feature list.

Signed-off-by: Kiran Kumar K 
Signed-off-by: Vamsi Attunuru 
---
 doc/guides/nics/features/octeontx2.ini |   2 +
 doc/guides/nics/features/octeontx2_vec.ini |   2 +
 doc/guides/nics/features/octeontx2_vf.ini  |   2 +
 doc/guides/nics/octeontx2.rst  |   1 +
 drivers/net/octeontx2/Makefile |   1 +
 drivers/net/octeontx2/meson.build  |   1 +
 drivers/net/octeontx2/otx2_ethdev.c|   3 +
 drivers/net/octeontx2/otx2_ethdev.h|  17 +++
 drivers/net/octeontx2/otx2_stats.c | 117 +
 9 files changed, 146 insertions(+)
 create mode 100644 drivers/net/octeontx2/otx2_stats.c

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index 828351409..557107016 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -10,6 +10,8 @@ SR-IOV   = Y
 Multiprocess aware   = Y
 Link status  = Y
 Link status event= Y
+Basic stats  = Y
+Stats per queue  = Y
 Registers dump   = Y
 Linux VFIO   = Y
 ARMv8= Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index 719692dc6..3a2b78e06 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -10,6 +10,8 @@ SR-IOV   = Y
 Multiprocess aware   = Y
 Link status  = Y
 Link status event= Y
+Basic stats  = Y
+Stats per queue  = Y
 Registers dump   = Y
 Linux VFIO   = Y
 ARMv8= Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
index 4d5667583..499f66c5c 100644
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -9,6 +9,8 @@ Lock-free Tx queue   = Y
 Multiprocess aware   = Y
 Link status  = Y
 Link status event= Y
+Basic stats  = Y
+Stats per queue  = Y
 Registers dump   = Y
 Linux VFIO   = Y
 ARMv8= Y
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index a163f9128..2944bbb99 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -18,6 +18,7 @@ Features of the OCTEON TX2 Ethdev PMD are:
 
 - SR-IOV VF
 - Lock-free Tx queue
+- Port hardware statistics
 - Link state information
 - Debug utilities - Context dump and error interrupt support
 
diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index 2dfb5043d..fbe5e9f44 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -30,6 +30,7 @@ LIBABIVER := 1
 SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
otx2_mac.c  \
otx2_link.c \
+   otx2_stats.c\
otx2_ethdev.c   \
otx2_ethdev_irq.c \
otx2_ethdev_ops.c \
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index d693386b9..1c57b1bb4 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -5,6 +5,7 @@
 sources = files(
'otx2_mac.c',
'otx2_link.c',
+   'otx2_stats.c',
'otx2_ethdev.c',
'otx2_ethdev_irq.c',
'otx2_ethdev_ops.c',
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index cb4f6ebb9..5787029d9 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -234,7 +234,10 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.dev_infos_get= otx2_nix_info_get,
.dev_configure= otx2_nix_configure,
.link_update  = otx2_nix_link_update,
+   .stats_get= otx2_nix_dev_stats_get,
+   .stats_reset  = otx2_nix_dev_stats_reset,
.get_reg  = otx2_nix_dev_get_reg,
+   .queue_stats_mapping_set  = otx2_nix_queue_stats_mapping,
 };
 
 static inline int
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index d8490337d..1cd9893a6 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -77,6 +77,12 @@
 #define NIX_TX_NB_SEG_MAX  9
 #endif
 
+#define CQ_OP_STAT_OP_ERR  63
+#define CQ_OP_STAT_CQ_ERR  46
+
+#define OP_ERR BIT_ULL(CQ_OP_STAT_OP_ERR)
+#define CQ_ERR BIT_ULL(CQ_OP_STAT_CQ_ERR)
+
 #define NIX_RSS_OFFLOAD(ETH_RSS_PORT | ETH_RSS_IP | 
ETH_RSS_UDP |\
 ETH_RSS_TCP | ETH_RSS_SCTP | \
 ETH_RSS_TUNNEL | ETH_RSS_L2_PAYLOAD)
@@ -156,6 +162,8 @@ struct otx2_eth_dev {
uint64_t tx_offload_capa;
struct otx2_qint qints_mem[RTE_MAX_QUEUES_PER_PORT];
struct otx2_rss_info rss_info;
+   

[dpdk-dev] [PATCH v2 14/57] net/octeontx2: add promiscuous and allmulticast mode

[jerinj]

From: Vamsi Attunuru 

Add promiscuous and allmulticast mode for PF devices and
update the respective feature list.

Signed-off-by: Vamsi Attunuru 
Signed-off-by: Sunil Kumar Kori 
---
 doc/guides/nics/features/octeontx2.ini |  2 +
 doc/guides/nics/features/octeontx2_vec.ini |  2 +
 doc/guides/nics/octeontx2.rst  |  1 +
 drivers/net/octeontx2/otx2_ethdev.c|  4 ++
 drivers/net/octeontx2/otx2_ethdev.h|  6 ++
 drivers/net/octeontx2/otx2_ethdev_ops.c| 82 ++
 6 files changed, 97 insertions(+)

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index 8d7c3588c..9f682609d 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -10,6 +10,8 @@ SR-IOV   = Y
 Multiprocess aware   = Y
 Link status  = Y
 Link status event= Y
+Promiscuous mode = Y
+Allmulticast mode= Y
 Basic stats  = Y
 Stats per queue  = Y
 Extended stats   = Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index a6e6876fa..764e95ce6 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -10,6 +10,8 @@ SR-IOV   = Y
 Multiprocess aware   = Y
 Link status  = Y
 Link status event= Y
+Promiscuous mode = Y
+Allmulticast mode= Y
 Basic stats  = Y
 Extended stats   = Y
 Stats per queue  = Y
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index 2944bbb99..9ef7be08f 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -16,6 +16,7 @@ Features
 
 Features of the OCTEON TX2 Ethdev PMD are:
 
+- Promiscuous mode
 - SR-IOV VF
 - Lock-free Tx queue
 - Port hardware statistics
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 937ba6399..826ce7f4e 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -237,6 +237,10 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.stats_get= otx2_nix_dev_stats_get,
.stats_reset  = otx2_nix_dev_stats_reset,
.get_reg  = otx2_nix_dev_get_reg,
+   .promiscuous_enable   = otx2_nix_promisc_enable,
+   .promiscuous_disable  = otx2_nix_promisc_disable,
+   .allmulticast_enable  = otx2_nix_allmulticast_enable,
+   .allmulticast_disable = otx2_nix_allmulticast_disable,
.queue_stats_mapping_set  = otx2_nix_queue_stats_mapping,
.xstats_get   = otx2_nix_xstats_get,
.xstats_get_names = otx2_nix_xstats_get_names,
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 7d53a6643..814fd6ec3 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -178,6 +178,12 @@ otx2_eth_pmd_priv(struct rte_eth_dev *eth_dev)
 void otx2_nix_info_get(struct rte_eth_dev *eth_dev,
   struct rte_eth_dev_info *dev_info);
 
+void otx2_nix_promisc_config(struct rte_eth_dev *eth_dev, int en);
+void otx2_nix_promisc_enable(struct rte_eth_dev *eth_dev);
+void otx2_nix_promisc_disable(struct rte_eth_dev *eth_dev);
+void otx2_nix_allmulticast_enable(struct rte_eth_dev *eth_dev);
+void otx2_nix_allmulticast_disable(struct rte_eth_dev *eth_dev);
+
 /* Link */
 void otx2_nix_toggle_flag_link_cfg(struct otx2_eth_dev *dev, bool set);
 int otx2_nix_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete);
diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c 
b/drivers/net/octeontx2/otx2_ethdev_ops.c
index df7e909d2..301a597f8 100644
--- a/drivers/net/octeontx2/otx2_ethdev_ops.c
+++ b/drivers/net/octeontx2/otx2_ethdev_ops.c
@@ -4,6 +4,88 @@
 
 #include "otx2_ethdev.h"
 
+static void
+nix_cgx_promisc_config(struct rte_eth_dev *eth_dev, int en)
+{
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+   struct otx2_mbox *mbox = dev->mbox;
+
+   if (otx2_dev_is_vf(dev))
+   return;
+
+   if (en)
+   otx2_mbox_alloc_msg_cgx_promisc_enable(mbox);
+   else
+   otx2_mbox_alloc_msg_cgx_promisc_disable(mbox);
+
+   otx2_mbox_process(mbox);
+}
+
+void
+otx2_nix_promisc_config(struct rte_eth_dev *eth_dev, int en)
+{
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+   struct otx2_mbox *mbox = dev->mbox;
+   struct nix_rx_mode *req;
+
+   if (otx2_dev_is_vf(dev))
+   return;
+
+   req = otx2_mbox_alloc_msg_nix_set_rx_mode(mbox);
+
+   if (en)
+   req->mode = NIX_RX_MODE_UCAST | NIX_RX_MODE_PROMISC;
+
+   otx2_mbox_process(mbox);
+   eth_dev->data->promiscuous = en;
+}
+
+void
+otx2_nix_promisc_enable(struct rte_eth_dev *eth_dev)
+{
+   otx2_nix_promisc_config(eth_dev, 1);
+   nix_cgx_promisc_config(eth_dev, 1);
+}
+
+void
+otx2_nix_pro

[dpdk-dev] [PATCH v2 18/57] net/octeontx2: add Tx queue setup and release

[jerinj]

From: Jerin Jacob 

Add Tx queue setup and release.

Signed-off-by: Jerin Jacob 
Signed-off-by: Nithin Dabilpuram 
---
 doc/guides/nics/features/octeontx2.ini |   1 +
 doc/guides/nics/features/octeontx2_vec.ini |   1 +
 doc/guides/nics/features/octeontx2_vf.ini  |   1 +
 doc/guides/nics/octeontx2.rst  |   1 +
 drivers/net/octeontx2/otx2_ethdev.c| 385 -
 drivers/net/octeontx2/otx2_ethdev.h|  25 ++
 drivers/net/octeontx2/otx2_ethdev_ops.c|   3 +-
 drivers/net/octeontx2/otx2_tx.h|  28 ++
 8 files changed, 443 insertions(+), 2 deletions(-)
 create mode 100644 drivers/net/octeontx2/otx2_tx.h

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index d0a2204d2..c8f07fa1d 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -11,6 +11,7 @@ Multiprocess aware   = Y
 Link status  = Y
 Link status event= Y
 Runtime Rx queue setup = Y
+Runtime Tx queue setup = Y
 Promiscuous mode = Y
 Allmulticast mode= Y
 Unicast MAC filter   = Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index 64125a73f..a98b7d523 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -11,6 +11,7 @@ Multiprocess aware   = Y
 Link status  = Y
 Link status event= Y
 Runtime Rx queue setup = Y
+Runtime Tx queue setup = Y
 Promiscuous mode = Y
 Allmulticast mode= Y
 Unicast MAC filter   = Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
index acda5e680..9746357ce 100644
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -10,6 +10,7 @@ Multiprocess aware   = Y
 Link status  = Y
 Link status event= Y
 Runtime Rx queue setup = Y
+Runtime Tx queue setup = Y
 RSS hash = Y
 RSS key update   = Y
 RSS reta update  = Y
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index 3bee3f3ca..d7e8f3d56 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -19,6 +19,7 @@ Features of the OCTEON TX2 Ethdev PMD are:
 - Promiscuous mode
 - SR-IOV VF
 - Lock-free Tx queue
+- Multiple queues for TX and RX
 - Receiver Side Scaling (RSS)
 - MAC filtering
 - Port hardware statistics
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index dbbc2263d..62943cc31 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -422,6 +422,373 @@ otx2_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, 
uint16_t rq,
return rc;
 }
 
+static inline uint8_t
+nix_sq_max_sqe_sz(struct otx2_eth_txq *txq)
+{
+   /*
+* Maximum three segments can be supported with W8, Choose
+* NIX_MAXSQESZ_W16 for multi segment offload.
+*/
+   if (txq->offloads & DEV_TX_OFFLOAD_MULTI_SEGS)
+   return NIX_MAXSQESZ_W16;
+   else
+   return NIX_MAXSQESZ_W8;
+}
+
+static int
+nix_sq_init(struct otx2_eth_txq *txq)
+{
+   struct otx2_eth_dev *dev = txq->dev;
+   struct otx2_mbox *mbox = dev->mbox;
+   struct nix_aq_enq_req *sq;
+
+   if (txq->sqb_pool->pool_id == 0)
+   return -EINVAL;
+
+   sq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
+   sq->qidx = txq->sq;
+   sq->ctype = NIX_AQ_CTYPE_SQ;
+   sq->op = NIX_AQ_INSTOP_INIT;
+   sq->sq.max_sqe_size = nix_sq_max_sqe_sz(txq);
+
+   sq->sq.default_chan = dev->tx_chan_base;
+   sq->sq.sqe_stype = NIX_STYPE_STF;
+   sq->sq.ena = 1;
+   if (sq->sq.max_sqe_size == NIX_MAXSQESZ_W8)
+   sq->sq.sqe_stype = NIX_STYPE_STP;
+   sq->sq.sqb_aura =
+   npa_lf_aura_handle_to_aura(txq->sqb_pool->pool_id);
+   sq->sq.sq_int_ena = BIT(NIX_SQINT_LMT_ERR);
+   sq->sq.sq_int_ena |= BIT(NIX_SQINT_SQB_ALLOC_FAIL);
+   sq->sq.sq_int_ena |= BIT(NIX_SQINT_SEND_ERR);
+   sq->sq.sq_int_ena |= BIT(NIX_SQINT_MNQ_ERR);
+
+   /* Many to one reduction */
+   sq->sq.qint_idx = txq->sq % dev->qints;
+
+   return otx2_mbox_process(mbox);
+}
+
+static int
+nix_sq_uninit(struct otx2_eth_txq *txq)
+{
+   struct otx2_eth_dev *dev = txq->dev;
+   struct otx2_mbox *mbox = dev->mbox;
+   struct ndc_sync_op *ndc_req;
+   struct nix_aq_enq_rsp *rsp;
+   struct nix_aq_enq_req *aq;
+   uint16_t sqes_per_sqb;
+   void *sqb_buf;
+   int rc, count;
+
+   otx2_nix_dbg("Cleaning up sq %u", txq->sq);
+
+   aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
+   aq->qidx = txq->sq;
+   aq->ctype = NIX_AQ_CTYPE_SQ;
+   aq->op = NIX_AQ_INSTOP_READ;
+
+   rc = otx2_mbox_process_msg(mbox, (void *)&rsp);
+   if (rc)
+   return rc;
+
+   /* Check if sq is already cleaned up */
+   if (!rsp->sq.ena)
+   return 0;
+
+

[dpdk-dev] [PATCH v2 16/57] net/octeontx2: add RSS support

[jerinj]

From: Vamsi Attunuru 

Add RSS support and expose RSS related functions
to implement RSS action for rte_flow driver.

Signed-off-by: Vamsi Attunuru 
Signed-off-by: Kiran Kumar K 
---
 doc/guides/nics/features/octeontx2.ini |   4 +
 doc/guides/nics/features/octeontx2_vec.ini |   4 +
 doc/guides/nics/features/octeontx2_vf.ini  |   4 +
 doc/guides/nics/octeontx2.rst  |   1 +
 drivers/net/octeontx2/Makefile |   1 +
 drivers/net/octeontx2/meson.build  |   1 +
 drivers/net/octeontx2/otx2_ethdev.c|  11 +
 drivers/net/octeontx2/otx2_ethdev.h|  33 ++
 drivers/net/octeontx2/otx2_rss.c   | 372 +
 9 files changed, 431 insertions(+)
 create mode 100644 drivers/net/octeontx2/otx2_rss.c

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index 566496113..f2d47d57b 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -13,6 +13,10 @@ Link status event= Y
 Promiscuous mode = Y
 Allmulticast mode= Y
 Unicast MAC filter   = Y
+RSS hash = Y
+RSS key update   = Y
+RSS reta update  = Y
+Inner RSS= Y
 Basic stats  = Y
 Stats per queue  = Y
 Extended stats   = Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index 195a48940..a67353d2a 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -13,6 +13,10 @@ Link status event= Y
 Promiscuous mode = Y
 Allmulticast mode= Y
 Unicast MAC filter   = Y
+RSS hash = Y
+RSS key update   = Y
+RSS reta update  = Y
+Inner RSS= Y
 Basic stats  = Y
 Extended stats   = Y
 Stats per queue  = Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
index 6ec83e823..97d66ddde 100644
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -9,6 +9,10 @@ Lock-free Tx queue   = Y
 Multiprocess aware   = Y
 Link status  = Y
 Link status event= Y
+RSS hash = Y
+RSS key update   = Y
+RSS reta update  = Y
+Inner RSS= Y
 Basic stats  = Y
 Extended stats   = Y
 Stats per queue  = Y
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index 8385c9c18..3bee3f3ca 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -19,6 +19,7 @@ Features of the OCTEON TX2 Ethdev PMD are:
 - Promiscuous mode
 - SR-IOV VF
 - Lock-free Tx queue
+- Receiver Side Scaling (RSS)
 - MAC filtering
 - Port hardware statistics
 - Link state information
diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index fbe5e9f44..f9f9ae6e6 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -28,6 +28,7 @@ LIBABIVER := 1
 # all source are stored in SRCS-y
 #
 SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
+   otx2_rss.c  \
otx2_mac.c  \
otx2_link.c \
otx2_stats.c\
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index 1c57b1bb4..8681a2642 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -3,6 +3,7 @@
 #
 
 sources = files(
+   'otx2_rss.c',
'otx2_mac.c',
'otx2_link.c',
'otx2_stats.c',
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index a72c901f4..5289c79e8 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -195,6 +195,13 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
goto fail;
}
 
+   /* Configure RSS */
+   rc = otx2_nix_rss_config(eth_dev);
+   if (rc) {
+   otx2_err("Failed to configure rss rc=%d", rc);
+   goto free_nix_lf;
+   }
+
/* Register queue IRQs */
rc = oxt2_nix_register_queue_irqs(eth_dev);
if (rc) {
@@ -245,6 +252,10 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.allmulticast_enable  = otx2_nix_allmulticast_enable,
.allmulticast_disable = otx2_nix_allmulticast_disable,
.queue_stats_mapping_set  = otx2_nix_queue_stats_mapping,
+   .reta_update  = otx2_nix_dev_reta_update,
+   .reta_query   = otx2_nix_dev_reta_query,
+   .rss_hash_update  = otx2_nix_rss_hash_update,
+   .rss_hash_conf_get= otx2_nix_rss_hash_conf_get,
.xstats_get   = otx2_nix_xstats_get,
.xstats_get_names = otx2_nix_xstats_get_names,
.xstats_reset = otx2_nix_xstats_reset,
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 56517845b..19a4e45b0 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h

[dpdk-dev] [PATCH v2 20/57] net/octeontx2: add queue start and stop operations

[jerinj]

From: Nithin Dabilpuram 

Add queue start and stop operations. Tx queue needs
to update the flow control value, Which will be
added in sub subsequent patch.

Signed-off-by: Nithin Dabilpuram 
Signed-off-by: Vamsi Attunuru 
---
 doc/guides/nics/features/octeontx2.ini |  1 +
 doc/guides/nics/features/octeontx2_vec.ini |  1 +
 doc/guides/nics/features/octeontx2_vf.ini  |  1 +
 drivers/net/octeontx2/otx2_ethdev.c| 92 ++
 drivers/net/octeontx2/otx2_ethdev.h|  2 +
 5 files changed, 97 insertions(+)

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index c8f07fa1d..ca40358da 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -12,6 +12,7 @@ Link status  = Y
 Link status event= Y
 Runtime Rx queue setup = Y
 Runtime Tx queue setup = Y
+Queue start/stop = Y
 Promiscuous mode = Y
 Allmulticast mode= Y
 Unicast MAC filter   = Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index a98b7d523..b720c116f 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -12,6 +12,7 @@ Link status  = Y
 Link status event= Y
 Runtime Rx queue setup = Y
 Runtime Tx queue setup = Y
+Queue start/stop = Y
 Promiscuous mode = Y
 Allmulticast mode= Y
 Unicast MAC filter   = Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
index 9746357ce..5a287493f 100644
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -11,6 +11,7 @@ Link status  = Y
 Link status event= Y
 Runtime Rx queue setup = Y
 Runtime Tx queue setup = Y
+Queue start/stop = Y
 RSS hash = Y
 RSS key update   = Y
 RSS reta update  = Y
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index bc6e8fb8a..c8271b1ab 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -252,6 +252,26 @@ nix_cq_rq_init(struct rte_eth_dev *eth_dev, struct 
otx2_eth_dev *dev,
return rc;
 }
 
+static int
+nix_rq_enb_dis(struct rte_eth_dev *eth_dev,
+  struct otx2_eth_rxq *rxq, const bool enb)
+{
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+   struct otx2_mbox *mbox = dev->mbox;
+   struct nix_aq_enq_req *aq;
+
+   /* Pkts will be dropped silently if RQ is disabled */
+   aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
+   aq->qidx = rxq->rq;
+   aq->ctype = NIX_AQ_CTYPE_RQ;
+   aq->op = NIX_AQ_INSTOP_WRITE;
+
+   aq->rq.ena = enb;
+   aq->rq_mask.ena = ~(aq->rq_mask.ena);
+
+   return otx2_mbox_process(mbox);
+}
+
 static int
 nix_cq_rq_uninit(struct rte_eth_dev *eth_dev, struct otx2_eth_rxq *rxq)
 {
@@ -1091,6 +,74 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
return rc;
 }
 
+int
+otx2_nix_tx_queue_start(struct rte_eth_dev *eth_dev, uint16_t qidx)
+{
+   struct rte_eth_dev_data *data = eth_dev->data;
+
+   if (data->tx_queue_state[qidx] == RTE_ETH_QUEUE_STATE_STARTED)
+   return 0;
+
+   data->tx_queue_state[qidx] = RTE_ETH_QUEUE_STATE_STARTED;
+   return 0;
+}
+
+int
+otx2_nix_tx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t qidx)
+{
+   struct rte_eth_dev_data *data = eth_dev->data;
+
+   if (data->tx_queue_state[qidx] == RTE_ETH_QUEUE_STATE_STOPPED)
+   return 0;
+
+   data->tx_queue_state[qidx] = RTE_ETH_QUEUE_STATE_STOPPED;
+   return 0;
+}
+
+static int
+otx2_nix_rx_queue_start(struct rte_eth_dev *eth_dev, uint16_t qidx)
+{
+   struct otx2_eth_rxq *rxq = eth_dev->data->rx_queues[qidx];
+   struct rte_eth_dev_data *data = eth_dev->data;
+   int rc;
+
+   if (data->rx_queue_state[qidx] == RTE_ETH_QUEUE_STATE_STARTED)
+   return 0;
+
+   rc = nix_rq_enb_dis(rxq->eth_dev, rxq, true);
+   if (rc) {
+   otx2_err("Failed to enable rxq=%u, rc=%d", qidx, rc);
+   goto done;
+   }
+
+   data->rx_queue_state[qidx] = RTE_ETH_QUEUE_STATE_STARTED;
+
+done:
+   return rc;
+}
+
+static int
+otx2_nix_rx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t qidx)
+{
+   struct otx2_eth_rxq *rxq = eth_dev->data->rx_queues[qidx];
+   struct rte_eth_dev_data *data = eth_dev->data;
+   int rc;
+
+   if (data->rx_queue_state[qidx] == RTE_ETH_QUEUE_STATE_STOPPED)
+   return 0;
+
+   rc = nix_rq_enb_dis(rxq->eth_dev, rxq, false);
+   if (rc) {
+   otx2_err("Failed to disable rxq=%u, rc=%d", qidx, rc);
+   goto done;
+   }
+
+   data->rx_queue_state[qidx] = RTE_ETH_QUEUE_STATE_STOPPED;
+
+done:
+   return rc;
+}
+
 /* Initialize and register driver with DPDK Application */
 static const struct eth_dev_ops otx2_eth_dev_ops = {
.dev_infos_get  

[dpdk-dev] [PATCH v2 21/57] net/octeontx2: introduce traffic manager

[jerinj]

From: Nithin Dabilpuram 

Introduce traffic manager infra and default hierarchy
creation.

Upon ethdev configure, a default hierarchy is
created with one-to-one mapped tm nodes. This topology
will be overridden when user explicitly creates and commits
a new hierarchy using rte_tm interface.

Signed-off-by: Nithin Dabilpuram 
Signed-off-by: Krzysztof Kanas 
---
 drivers/net/octeontx2/Makefile  |   1 +
 drivers/net/octeontx2/meson.build   |   1 +
 drivers/net/octeontx2/otx2_ethdev.c |  16 ++
 drivers/net/octeontx2/otx2_ethdev.h |  14 ++
 drivers/net/octeontx2/otx2_tm.c | 252 
 drivers/net/octeontx2/otx2_tm.h |  67 
 6 files changed, 351 insertions(+)
 create mode 100644 drivers/net/octeontx2/otx2_tm.c
 create mode 100644 drivers/net/octeontx2/otx2_tm.h

diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index f40561afb..164621087 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -28,6 +28,7 @@ LIBABIVER := 1
 # all source are stored in SRCS-y
 #
 SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
+   otx2_tm.c   \
otx2_rss.c  \
otx2_mac.c  \
otx2_link.c \
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index 8681a2642..e344d877f 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -3,6 +3,7 @@
 #
 
 sources = files(
+   'otx2_tm.c',
'otx2_rss.c',
'otx2_mac.c',
'otx2_link.c',
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index c8271b1ab..899865749 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -1034,6 +1034,7 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
rc = nix_store_queue_cfg_and_then_release(eth_dev);
if (rc)
goto fail;
+   otx2_nix_tm_fini(eth_dev);
nix_lf_free(dev);
}
 
@@ -1067,6 +1068,13 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
goto free_nix_lf;
}
 
+   /* Init the default TM scheduler hierarchy */
+   rc = otx2_nix_tm_init_default(eth_dev);
+   if (rc) {
+   otx2_err("Failed to init traffic manager rc=%d", rc);
+   goto free_nix_lf;
+   }
+
/* Register queue IRQs */
rc = oxt2_nix_register_queue_irqs(eth_dev);
if (rc) {
@@ -1369,6 +1377,9 @@ otx2_eth_dev_init(struct rte_eth_dev *eth_dev)
/* Also sync same MAC address to CGX table */
otx2_cgx_mac_addr_set(eth_dev, ð_dev->data->mac_addrs[0]);
 
+   /* Initialize the tm data structures */
+   otx2_nix_tm_conf_init(eth_dev);
+
dev->tx_offload_capa = nix_get_tx_offload_capa(dev);
dev->rx_offload_capa = nix_get_rx_offload_capa(dev);
 
@@ -1424,6 +1435,11 @@ otx2_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool 
mbox_close)
}
eth_dev->data->nb_rx_queues = 0;
 
+   /* Free tm resources */
+   rc = otx2_nix_tm_fini(eth_dev);
+   if (rc)
+   otx2_err("Failed to cleanup tm, rc=%d", rc);
+
/* Unregister queue irqs */
oxt2_nix_unregister_queue_irqs(eth_dev);
 
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 4e06b7111..9f73bf89b 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -19,6 +19,7 @@
 #include "otx2_irq.h"
 #include "otx2_mempool.h"
 #include "otx2_rx.h"
+#include "otx2_tm.h"
 #include "otx2_tx.h"
 
 #define OTX2_ETH_DEV_PMD_VERSION   "1.0"
@@ -201,6 +202,19 @@ struct otx2_eth_dev {
uint64_t rx_offload_capa;
uint64_t tx_offload_capa;
struct otx2_qint qints_mem[RTE_MAX_QUEUES_PER_PORT];
+   uint16_t txschq[NIX_TXSCH_LVL_CNT];
+   uint16_t txschq_contig[NIX_TXSCH_LVL_CNT];
+   uint16_t txschq_index[NIX_TXSCH_LVL_CNT];
+   uint16_t txschq_contig_index[NIX_TXSCH_LVL_CNT];
+   /* Dis-contiguous queues */
+   uint16_t txschq_list[NIX_TXSCH_LVL_CNT][MAX_TXSCHQ_PER_FUNC];
+   /* Contiguous queues */
+   uint16_t txschq_contig_list[NIX_TXSCH_LVL_CNT][MAX_TXSCHQ_PER_FUNC];
+   uint16_t otx2_tm_root_lvl;
+   uint16_t tm_flags;
+   uint16_t tm_leaf_cnt;
+   struct otx2_nix_tm_node_list node_list;
+   struct otx2_nix_tm_shaper_profile_list shaper_profile_list;
struct otx2_rss_info rss_info;
uint32_t txmap[RTE_ETHDEV_QUEUE_STAT_CNTRS];
uint32_t rxmap[RTE_ETHDEV_QUEUE_STAT_CNTRS];
diff --git a/drivers/net/octeontx2/otx2_tm.c b/drivers/net/octeontx2/otx2_tm.c
new file mode 100644
index 0..bc0474242
--- /dev/null
+++ b/drivers/net/octeontx2/otx2_tm.c
@@ -0,0 +1,252 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2019 Marvell International Ltd.
+ */
+
+#include 
+
+#include "otx2_ethdev.h"
+#include "otx2_tm.h"
+
+/

[dpdk-dev] [PATCH v2 19/57] net/octeontx2: handle port reconfigure

[jerinj]

From: Vamsi Attunuru 

setup tx & rx queues with the previous configuration during
port reconfig, it handles cases like port reconfigure without
reconfiguring tx & rx queues.

Signed-off-by: Vamsi Attunuru 
Signed-off-by: Nithin Dabilpuram 
---
 drivers/net/octeontx2/otx2_ethdev.c | 180 
 drivers/net/octeontx2/otx2_ethdev.h |   2 +
 2 files changed, 182 insertions(+)

diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 62943cc31..bc6e8fb8a 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -788,6 +788,172 @@ otx2_nix_tx_queue_setup(struct rte_eth_dev *eth_dev, 
uint16_t sq,
return rc;
 }
 
+static int
+nix_store_queue_cfg_and_then_release(struct rte_eth_dev *eth_dev)
+{
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+   struct otx2_eth_qconf *tx_qconf = NULL;
+   struct otx2_eth_qconf *rx_qconf = NULL;
+   struct otx2_eth_txq **txq;
+   struct otx2_eth_rxq **rxq;
+   int i, nb_rxq, nb_txq;
+
+   nb_rxq = RTE_MIN(dev->configured_nb_rx_qs, eth_dev->data->nb_rx_queues);
+   nb_txq = RTE_MIN(dev->configured_nb_tx_qs, eth_dev->data->nb_tx_queues);
+
+   tx_qconf = malloc(nb_txq * sizeof(*tx_qconf));
+   if (tx_qconf == NULL) {
+   otx2_err("Failed to allocate memory for tx_qconf");
+   goto fail;
+   }
+
+   rx_qconf = malloc(nb_rxq * sizeof(*rx_qconf));
+   if (rx_qconf == NULL) {
+   otx2_err("Failed to allocate memory for rx_qconf");
+   goto fail;
+   }
+
+   txq = (struct otx2_eth_txq **)eth_dev->data->tx_queues;
+   for (i = 0; i < nb_txq; i++) {
+   if (txq[i] == NULL) {
+   otx2_err("txq[%d] is already released", i);
+   goto fail;
+   }
+   memcpy(&tx_qconf[i], &txq[i]->qconf, sizeof(*tx_qconf));
+   otx2_nix_tx_queue_release(txq[i]);
+   eth_dev->data->tx_queues[i] = NULL;
+   }
+
+   rxq = (struct otx2_eth_rxq **)eth_dev->data->rx_queues;
+   for (i = 0; i < nb_rxq; i++) {
+   if (rxq[i] == NULL) {
+   otx2_err("rxq[%d] is already released", i);
+   goto fail;
+   }
+   memcpy(&rx_qconf[i], &rxq[i]->qconf, sizeof(*rx_qconf));
+   otx2_nix_rx_queue_release(rxq[i]);
+   eth_dev->data->rx_queues[i] = NULL;
+   }
+
+   dev->tx_qconf = tx_qconf;
+   dev->rx_qconf = rx_qconf;
+   return 0;
+
+fail:
+   if (tx_qconf)
+   free(tx_qconf);
+   if (rx_qconf)
+   free(rx_qconf);
+
+   return -ENOMEM;
+}
+
+static int
+nix_restore_queue_cfg(struct rte_eth_dev *eth_dev)
+{
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+   struct otx2_eth_qconf *tx_qconf = dev->tx_qconf;
+   struct otx2_eth_qconf *rx_qconf = dev->rx_qconf;
+   struct otx2_eth_txq **txq;
+   struct otx2_eth_rxq **rxq;
+   int rc, i, nb_rxq, nb_txq;
+
+   nb_rxq = RTE_MIN(dev->configured_nb_rx_qs, eth_dev->data->nb_rx_queues);
+   nb_txq = RTE_MIN(dev->configured_nb_tx_qs, eth_dev->data->nb_tx_queues);
+
+   rc = -ENOMEM;
+   /* Setup tx & rx queues with previous configuration so
+* that the queues can be functional in cases like ports
+* are started without re configuring queues.
+*
+* Usual re config sequence is like below:
+* port_configure() {
+*  if(reconfigure) {
+*  queue_release()
+*  queue_setup()
+*  }
+*  queue_configure() {
+*  queue_release()
+*  queue_setup()
+*  }
+* }
+* port_start()
+*
+* In some application's control path, queue_configure() would
+* NOT be invoked for TXQs/RXQs in port_configure().
+* In such cases, queues can be functional after start as the
+* queues are already setup in port_configure().
+*/
+   for (i = 0; i < nb_txq; i++) {
+   rc = otx2_nix_tx_queue_setup(eth_dev, i, tx_qconf[i].nb_desc,
+tx_qconf[i].socket_id,
+&tx_qconf[i].conf.tx);
+   if (rc) {
+   otx2_err("Failed to setup tx queue rc=%d", rc);
+   txq = (struct otx2_eth_txq **)eth_dev->data->tx_queues;
+   for (i -= 1; i >= 0; i--)
+   otx2_nix_tx_queue_release(txq[i]);
+   goto fail;
+   }
+   }
+
+   free(tx_qconf); tx_qconf = NULL;
+
+   for (i = 0; i < nb_rxq; i++) {
+   rc = otx2_nix_rx_queue_setup(eth_dev, i, rx_qconf[i].nb_desc,
+rx_qconf[i].socket_id,
+ 

[dpdk-dev] [PATCH v2 17/57] net/octeontx2: add Rx queue setup and release

[jerinj]

From: Jerin Jacob 

Add Rx queue setup and release.

Signed-off-by: Jerin Jacob 
Signed-off-by: Nithin Dabilpuram 
Signed-off-by: Vamsi Attunuru 
---
 doc/guides/nics/features/octeontx2.ini |   1 +
 doc/guides/nics/features/octeontx2_vec.ini |   1 +
 doc/guides/nics/features/octeontx2_vf.ini  |   1 +
 drivers/net/octeontx2/Makefile |   2 +-
 drivers/net/octeontx2/otx2_ethdev.c| 310 +
 drivers/net/octeontx2/otx2_ethdev.h|  51 
 drivers/net/octeontx2/otx2_ethdev_ops.c|   2 +
 mk/rte.app.mk  |   2 +-
 8 files changed, 368 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index f2d47d57b..d0a2204d2 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -10,6 +10,7 @@ SR-IOV   = Y
 Multiprocess aware   = Y
 Link status  = Y
 Link status event= Y
+Runtime Rx queue setup = Y
 Promiscuous mode = Y
 Allmulticast mode= Y
 Unicast MAC filter   = Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index a67353d2a..64125a73f 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -10,6 +10,7 @@ SR-IOV   = Y
 Multiprocess aware   = Y
 Link status  = Y
 Link status event= Y
+Runtime Rx queue setup = Y
 Promiscuous mode = Y
 Allmulticast mode= Y
 Unicast MAC filter   = Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
index 97d66ddde..acda5e680 100644
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -9,6 +9,7 @@ Lock-free Tx queue   = Y
 Multiprocess aware   = Y
 Link status  = Y
 Link status event= Y
+Runtime Rx queue setup = Y
 RSS hash = Y
 RSS key update   = Y
 RSS reta update  = Y
diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index f9f9ae6e6..f40561afb 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -39,6 +39,6 @@ SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
otx2_ethdev_devargs.c
 
 LDLIBS += -lrte_common_octeontx2 -lrte_mempool_octeontx2 -lrte_eal
-LDLIBS += -lrte_ethdev -lrte_bus_pci -lrte_kvargs
+LDLIBS += -lrte_ethdev -lrte_bus_pci -lrte_kvargs -lrte_mbuf  -lrte_mempool -lm
 
 include $(RTE_SDK)/mk/rte.lib.mk
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 5289c79e8..dbbc2263d 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -2,9 +2,15 @@
  * Copyright(C) 2019 Marvell International Ltd.
  */
 
+#include 
+#include 
+
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include "otx2_ethdev.h"
 
@@ -114,6 +120,308 @@ nix_lf_free(struct otx2_eth_dev *dev)
return otx2_mbox_process(mbox);
 }
 
+static inline void
+nix_rx_queue_reset(struct otx2_eth_rxq *rxq)
+{
+   rxq->head = 0;
+   rxq->available = 0;
+}
+
+static inline uint32_t
+nix_qsize_to_val(enum nix_q_size_e qsize)
+{
+   return (16UL << (qsize * 2));
+}
+
+static inline enum nix_q_size_e
+nix_qsize_clampup_get(struct otx2_eth_dev *dev, uint32_t val)
+{
+   int i;
+
+   if (otx2_ethdev_fixup_is_min_4k_q(dev))
+   i = nix_q_size_4K;
+   else
+   i = nix_q_size_16;
+
+   for (; i < nix_q_size_max; i++)
+   if (val <= nix_qsize_to_val(i))
+   break;
+
+   if (i >= nix_q_size_max)
+   i = nix_q_size_max - 1;
+
+   return i;
+}
+
+static int
+nix_cq_rq_init(struct rte_eth_dev *eth_dev, struct otx2_eth_dev *dev,
+  uint16_t qid, struct otx2_eth_rxq *rxq, struct rte_mempool *mp)
+{
+   struct otx2_mbox *mbox = dev->mbox;
+   const struct rte_memzone *rz;
+   uint32_t ring_size, cq_size;
+   struct nix_aq_enq_req *aq;
+   uint16_t first_skip;
+   int rc;
+
+   cq_size = rxq->qlen;
+   ring_size = cq_size * NIX_CQ_ENTRY_SZ;
+   rz = rte_eth_dma_zone_reserve(eth_dev, "cq", qid, ring_size,
+ NIX_CQ_ALIGN, dev->node);
+   if (rz == NULL) {
+   otx2_err("Failed to allocate mem for cq hw ring");
+   rc = -ENOMEM;
+   goto fail;
+   }
+   memset(rz->addr, 0, rz->len);
+   rxq->desc = (uintptr_t)rz->addr;
+   rxq->qmask = cq_size - 1;
+
+   aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
+   aq->qidx = qid;
+   aq->ctype = NIX_AQ_CTYPE_CQ;
+   aq->op = NIX_AQ_INSTOP_INIT;
+
+   aq->cq.ena = 1;
+   aq->cq.caching = 1;
+   aq->cq.qsize = rxq->qsize;
+   aq->cq.base = rz->iova;
+   aq->cq.avg_level = 0xff;
+   aq->cq.cq_err_int_ena = BIT(NIX_CQERRINT_CQE_FAULT);
+   aq->cq.cq_err_int_ena |= BIT(NIX_CQERRINT_DOOR

[dpdk-dev] [PATCH v2 22/57] net/octeontx2: alloc and free TM HW resources

[jerinj]

From: Krzysztof Kanas 

Allocate and free shaper/scheduler hardware resources for
nodes of hirearchy levels in sw.

Signed-off-by: Krzysztof Kanas 
Signed-off-by: Nithin Dabilpuram 
---
 drivers/net/octeontx2/otx2_tm.c | 350 
 1 file changed, 350 insertions(+)

diff --git a/drivers/net/octeontx2/otx2_tm.c b/drivers/net/octeontx2/otx2_tm.c
index bc0474242..91f31df05 100644
--- a/drivers/net/octeontx2/otx2_tm.c
+++ b/drivers/net/octeontx2/otx2_tm.c
@@ -54,6 +54,69 @@ nix_tm_node_search(struct otx2_eth_dev *dev,
return NULL;
 }
 
+static uint32_t
+check_rr(struct otx2_eth_dev *dev, uint32_t priority, uint32_t parent_id)
+{
+   struct otx2_nix_tm_node *tm_node;
+   uint32_t rr_num = 0;
+
+   TAILQ_FOREACH(tm_node, &dev->node_list, node) {
+   if (!tm_node->parent)
+   continue;
+
+   if (!(tm_node->parent->id == parent_id))
+   continue;
+
+   if (tm_node->priority == priority)
+   rr_num++;
+   }
+   return rr_num;
+}
+
+static int
+nix_tm_update_parent_info(struct otx2_eth_dev *dev)
+{
+   struct otx2_nix_tm_node *tm_node_child;
+   struct otx2_nix_tm_node *tm_node;
+   struct otx2_nix_tm_node *parent;
+   uint32_t rr_num = 0;
+   uint32_t priority;
+
+   TAILQ_FOREACH(tm_node, &dev->node_list, node) {
+   if (!tm_node->parent)
+   continue;
+   /* Count group of children of same priority i.e are RR */
+   parent = tm_node->parent;
+   priority = tm_node->priority;
+   rr_num = check_rr(dev, priority, parent->id);
+
+   /* Assuming that multiple RR groups are
+* not configured based on capability.
+*/
+   if (rr_num > 1) {
+   parent->rr_prio = priority;
+   parent->rr_num = rr_num;
+   }
+
+   /* Find out static priority children that are not in RR */
+   TAILQ_FOREACH(tm_node_child, &dev->node_list, node) {
+   if (!tm_node_child->parent)
+   continue;
+   if (parent->id != tm_node_child->parent->id)
+   continue;
+   if (parent->max_prio == UINT32_MAX &&
+   tm_node_child->priority != parent->rr_prio)
+   parent->max_prio = 0;
+
+   if (parent->max_prio < tm_node_child->priority &&
+   parent->rr_prio != tm_node_child->priority)
+   parent->max_prio = tm_node_child->priority;
+   }
+   }
+
+   return 0;
+}
+
 static int
 nix_tm_node_add_to_list(struct otx2_eth_dev *dev, uint32_t node_id,
uint32_t parent_node_id, uint32_t priority,
@@ -115,6 +178,274 @@ nix_tm_clear_shaper_profiles(struct otx2_eth_dev *dev)
return 0;
 }
 
+static int
+nix_tm_free_resources(struct otx2_eth_dev *dev, uint32_t flags_mask,
+ uint32_t flags, bool hw_only)
+{
+   struct otx2_nix_tm_shaper_profile *shaper_profile;
+   struct otx2_nix_tm_node *tm_node, *next_node;
+   struct otx2_mbox *mbox = dev->mbox;
+   struct nix_txsch_free_req *req;
+   uint32_t shaper_profile_id;
+   bool skip_node = false;
+   int rc = 0;
+
+   next_node = TAILQ_FIRST(&dev->node_list);
+   while (next_node) {
+   tm_node = next_node;
+   next_node = TAILQ_NEXT(tm_node, node);
+
+   /* Check for only requested nodes */
+   if ((tm_node->flags & flags_mask) != flags)
+   continue;
+
+   if (nix_tm_have_tl1_access(dev) &&
+   tm_node->hw_lvl_id ==  NIX_TXSCH_LVL_TL1)
+   skip_node = true;
+
+   otx2_tm_dbg("Free hwres for node %u, hwlvl %u, hw_id %u (%p)",
+   tm_node->id,  tm_node->hw_lvl_id,
+   tm_node->hw_id, tm_node);
+   /* Free specific HW resource if requested */
+   if (!skip_node && flags_mask &&
+   tm_node->flags & NIX_TM_NODE_HWRES) {
+   req = otx2_mbox_alloc_msg_nix_txsch_free(mbox);
+   req->flags = 0;
+   req->schq_lvl = tm_node->hw_lvl_id;
+   req->schq = tm_node->hw_id;
+   rc = otx2_mbox_process(mbox);
+   if (rc)
+   break;
+   } else {
+   skip_node = false;
+   }
+   tm_node->flags &= ~NIX_TM_NODE_HWRES;
+
+   /* Leave software elements if needed */
+   if (hw_only)
+   continue;
+
+   shaper_profile_id = tm_node->params.shaper_profile_id;
+   

[dpdk-dev] [PATCH v2 23/57] net/octeontx2: configure TM HW resources

[jerinj]

From: Nithin Dabilpuram 

This patch sets up and configure hierarchy in hw
nodes. Since all the registers are with RVU AF,
register configuration is also done using mbox
communication.

Signed-off-by: Nithin Dabilpuram 
Signed-off-by: Krzysztof Kanas 
---
 drivers/net/octeontx2/otx2_tm.c | 504 
 drivers/net/octeontx2/otx2_tm.h |  82 ++
 2 files changed, 586 insertions(+)

diff --git a/drivers/net/octeontx2/otx2_tm.c b/drivers/net/octeontx2/otx2_tm.c
index 91f31df05..c6154e4d4 100644
--- a/drivers/net/octeontx2/otx2_tm.c
+++ b/drivers/net/octeontx2/otx2_tm.c
@@ -20,6 +20,41 @@ enum otx2_tm_node_level {
OTX2_TM_LVL_MAX,
 };
 
+static inline
+uint64_t shaper2regval(struct shaper_params *shaper)
+{
+   return (shaper->burst_exponent << 37) | (shaper->burst_mantissa << 29) |
+   (shaper->div_exp << 13) | (shaper->exponent << 9) |
+   (shaper->mantissa << 1);
+}
+
+static int
+nix_get_link(struct otx2_eth_dev *dev)
+{
+   int link = 13 /* SDP */;
+   uint16_t lmac_chan;
+   uint16_t map;
+
+   lmac_chan = dev->tx_chan_base;
+
+   /* CGX lmac link */
+   if (lmac_chan >= 0x800) {
+   map = lmac_chan & 0x7FF;
+   link = 4 * ((map >> 8) & 0xF) + ((map >> 4) & 0xF);
+   } else if (lmac_chan < 0x700) {
+   /* LBK channel */
+   link = 12;
+   }
+
+   return link;
+}
+
+static uint8_t
+nix_get_relchan(struct otx2_eth_dev *dev)
+{
+   return dev->tx_chan_base & 0xff;
+}
+
 static bool
 nix_tm_have_tl1_access(struct otx2_eth_dev *dev)
 {
@@ -28,6 +63,24 @@ nix_tm_have_tl1_access(struct otx2_eth_dev *dev)
!is_lbk && !dev->maxvf;
 }
 
+static int
+find_prio_anchor(struct otx2_eth_dev *dev, uint32_t node_id)
+{
+   struct otx2_nix_tm_node *child_node;
+
+   TAILQ_FOREACH(child_node, &dev->node_list, node) {
+   if (!child_node->parent)
+   continue;
+   if (!(child_node->parent->id == node_id))
+   continue;
+   if (child_node->priority == child_node->parent->rr_prio)
+   continue;
+   return child_node->hw_id - child_node->priority;
+   }
+   return 0;
+}
+
+
 static struct otx2_nix_tm_shaper_profile *
 nix_tm_shaper_profile_search(struct otx2_eth_dev *dev, uint32_t shaper_id)
 {
@@ -40,6 +93,451 @@ nix_tm_shaper_profile_search(struct otx2_eth_dev *dev, 
uint32_t shaper_id)
return NULL;
 }
 
+static inline uint64_t
+shaper_rate_to_nix(uint64_t cclk_hz, uint64_t cclk_ticks,
+  uint64_t value, uint64_t *exponent_p,
+  uint64_t *mantissa_p, uint64_t *div_exp_p)
+{
+   uint64_t div_exp, exponent, mantissa;
+
+   /* Boundary checks */
+   if (value < MIN_SHAPER_RATE(cclk_hz, cclk_ticks) ||
+   value > MAX_SHAPER_RATE(cclk_hz, cclk_ticks))
+   return 0;
+
+   if (value <= SHAPER_RATE(cclk_hz, cclk_ticks, 0, 0, 0)) {
+   /* Calculate rate div_exp and mantissa using
+* the following formula:
+*
+* value = (cclk_hz * (256 + mantissa)
+*  / ((cclk_ticks << div_exp) * 256)
+*/
+   div_exp = 0;
+   exponent = 0;
+   mantissa = MAX_RATE_MANTISSA;
+
+   while (value < (cclk_hz / (cclk_ticks << div_exp)))
+   div_exp += 1;
+
+   while (value <
+  ((cclk_hz * (256 + mantissa)) /
+   ((cclk_ticks << div_exp) * 256)))
+   mantissa -= 1;
+   } else {
+   /* Calculate rate exponent and mantissa using
+* the following formula:
+*
+* value = (cclk_hz * ((256 + mantissa) << exponent)
+*  / (cclk_ticks * 256)
+*
+*/
+   div_exp = 0;
+   exponent = MAX_RATE_EXPONENT;
+   mantissa = MAX_RATE_MANTISSA;
+
+   while (value < (cclk_hz * (1 << exponent)) / cclk_ticks)
+   exponent -= 1;
+
+   while (value < (cclk_hz * ((256 + mantissa) << exponent)) /
+  (cclk_ticks * 256))
+   mantissa -= 1;
+   }
+
+   if (div_exp > MAX_RATE_DIV_EXP ||
+   exponent > MAX_RATE_EXPONENT || mantissa > MAX_RATE_MANTISSA)
+   return 0;
+
+   if (div_exp_p)
+   *div_exp_p = div_exp;
+   if (exponent_p)
+   *exponent_p = exponent;
+   if (mantissa_p)
+   *mantissa_p = mantissa;
+
+   /* Calculate real rate value */
+   return SHAPER_RATE(cclk_hz, cclk_ticks, exponent, mantissa, div_exp);
+}
+
+static inline uint64_t
+lx_shaper_rate_to_nix(uint64_t cclk_hz, uint32_t hw_lvl,
+ uint64_t value, uint64_t *exponent,
+ 

[dpdk-dev] [PATCH v2 27/57] net/octeontx2: add Rx and Tx descriptor operations

[jerinj]

From: Jerin Jacob 

Add Rx and Tx queue descriptor related operations.

Signed-off-by: Jerin Jacob 
Signed-off-by: Kiran Kumar K 
---
 doc/guides/nics/features/octeontx2.ini |  2 +
 doc/guides/nics/features/octeontx2_vec.ini |  2 +
 doc/guides/nics/features/octeontx2_vf.ini  |  2 +
 drivers/net/octeontx2/otx2_ethdev.c|  4 ++
 drivers/net/octeontx2/otx2_ethdev.h|  4 ++
 drivers/net/octeontx2/otx2_ethdev_ops.c| 83 ++
 6 files changed, 97 insertions(+)

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index 0de07776f..f07b64f24 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -12,6 +12,7 @@ Link status  = Y
 Link status event= Y
 Runtime Rx queue setup = Y
 Runtime Tx queue setup = Y
+Free Tx mbuf on demand = Y
 Queue start/stop = Y
 Promiscuous mode = Y
 Allmulticast mode= Y
@@ -21,6 +22,7 @@ RSS key update   = Y
 RSS reta update  = Y
 Inner RSS= Y
 Packet type parsing  = Y
+Rx descriptor status = Y
 Basic stats  = Y
 Stats per queue  = Y
 Extended stats   = Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index b4b253aa4..911c926e4 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -12,6 +12,7 @@ Link status  = Y
 Link status event= Y
 Runtime Rx queue setup = Y
 Runtime Tx queue setup = Y
+Free Tx mbuf on demand = Y
 Queue start/stop = Y
 Promiscuous mode = Y
 Allmulticast mode= Y
@@ -21,6 +22,7 @@ RSS key update   = Y
 RSS reta update  = Y
 Inner RSS= Y
 Packet type parsing  = Y
+Rx descriptor status = Y
 Basic stats  = Y
 Extended stats   = Y
 Stats per queue  = Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
index 21cc4861e..e275e6469 100644
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -11,12 +11,14 @@ Link status  = Y
 Link status event= Y
 Runtime Rx queue setup = Y
 Runtime Tx queue setup = Y
+Free Tx mbuf on demand = Y
 Queue start/stop = Y
 RSS hash = Y
 RSS key update   = Y
 RSS reta update  = Y
 Inner RSS= Y
 Packet type parsing  = Y
+Rx descriptor status = Y
 Basic stats  = Y
 Extended stats   = Y
 Stats per queue  = Y
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index a504870f6..feeba5c96 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -1295,6 +1295,10 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.xstats_get_names_by_id   = otx2_nix_xstats_get_names_by_id,
.rxq_info_get = otx2_nix_rxq_info_get,
.txq_info_get = otx2_nix_txq_info_get,
+   .rx_queue_count   = otx2_nix_rx_queue_count,
+   .rx_descriptor_done   = otx2_nix_rx_descriptor_done,
+   .rx_descriptor_status = otx2_nix_rx_descriptor_status,
+   .tx_done_cleanup  = otx2_nix_tx_done_cleanup,
.pool_ops_supported   = otx2_nix_pool_ops_supported,
 };
 
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 199d5f242..8f2691c80 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -279,6 +279,10 @@ void otx2_nix_rxq_info_get(struct rte_eth_dev *eth_dev, 
uint16_t queue_id,
   struct rte_eth_rxq_info *qinfo);
 void otx2_nix_txq_info_get(struct rte_eth_dev *eth_dev, uint16_t queue_id,
   struct rte_eth_txq_info *qinfo);
+uint32_t otx2_nix_rx_queue_count(struct rte_eth_dev *eth_dev, uint16_t qidx);
+int otx2_nix_tx_done_cleanup(void *txq, uint32_t free_cnt);
+int otx2_nix_rx_descriptor_done(void *rxq, uint16_t offset);
+int otx2_nix_rx_descriptor_status(void *rx_queue, uint16_t offset);
 
 void otx2_nix_promisc_config(struct rte_eth_dev *eth_dev, int en);
 void otx2_nix_promisc_enable(struct rte_eth_dev *eth_dev);
diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c 
b/drivers/net/octeontx2/otx2_ethdev_ops.c
index eda5f8a01..44cc17200 100644
--- a/drivers/net/octeontx2/otx2_ethdev_ops.c
+++ b/drivers/net/octeontx2/otx2_ethdev_ops.c
@@ -126,6 +126,89 @@ otx2_nix_txq_info_get(struct rte_eth_dev *eth_dev, 
uint16_t queue_id,
qinfo->conf.tx_deferred_start = 0;
 }
 
+static void
+nix_rx_head_tail_get(struct otx2_eth_dev *dev,
+uint32_t *head, uint32_t *tail, uint16_t queue_idx)
+{
+   uint64_t reg, val;
+
+   if (head == NULL || tail == NULL)
+   return;
+
+   reg = (((uint64_t)queue_idx) << 32);
+   val = otx2_atomic64_add_nosync(reg, (int64_t *)
+  (dev->base + NIX_LF_CQ_OP_STATUS));
+   if (val & (OP_ER

[dpdk-dev] [PATCH v2 26/57] net/octeontx2: add queue info and pool supported operations

[jerinj]

From: Nithin Dabilpuram 

Add Rx and Tx queue info get and pool ops supported
operations.

Signed-off-by: Nithin Dabilpuram 
Signed-off-by: Kiran Kumar K 
---
 drivers/net/octeontx2/otx2_ethdev.c |  3 ++
 drivers/net/octeontx2/otx2_ethdev.h |  5 +++
 drivers/net/octeontx2/otx2_ethdev_ops.c | 51 +
 3 files changed, 59 insertions(+)

diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index a9cdafc33..a504870f6 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -1293,6 +1293,9 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.xstats_reset = otx2_nix_xstats_reset,
.xstats_get_by_id = otx2_nix_xstats_get_by_id,
.xstats_get_names_by_id   = otx2_nix_xstats_get_names_by_id,
+   .rxq_info_get = otx2_nix_rxq_info_get,
+   .txq_info_get = otx2_nix_txq_info_get,
+   .pool_ops_supported   = otx2_nix_pool_ops_supported,
 };
 
 static inline int
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index cfc4dfe14..199d5f242 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -274,6 +274,11 @@ otx2_eth_pmd_priv(struct rte_eth_dev *eth_dev)
 /* Ops */
 void otx2_nix_info_get(struct rte_eth_dev *eth_dev,
   struct rte_eth_dev_info *dev_info);
+int otx2_nix_pool_ops_supported(struct rte_eth_dev *eth_dev, const char *pool);
+void otx2_nix_rxq_info_get(struct rte_eth_dev *eth_dev, uint16_t queue_id,
+  struct rte_eth_rxq_info *qinfo);
+void otx2_nix_txq_info_get(struct rte_eth_dev *eth_dev, uint16_t queue_id,
+  struct rte_eth_txq_info *qinfo);
 
 void otx2_nix_promisc_config(struct rte_eth_dev *eth_dev, int en);
 void otx2_nix_promisc_enable(struct rte_eth_dev *eth_dev);
diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c 
b/drivers/net/octeontx2/otx2_ethdev_ops.c
index 1c935b627..eda5f8a01 100644
--- a/drivers/net/octeontx2/otx2_ethdev_ops.c
+++ b/drivers/net/octeontx2/otx2_ethdev_ops.c
@@ -2,6 +2,8 @@
  * Copyright(C) 2019 Marvell International Ltd.
  */
 
+#include 
+
 #include "otx2_ethdev.h"
 
 static void
@@ -86,6 +88,55 @@ otx2_nix_allmulticast_disable(struct rte_eth_dev *eth_dev)
nix_allmulticast_config(eth_dev, 0);
 }
 
+void
+otx2_nix_rxq_info_get(struct rte_eth_dev *eth_dev, uint16_t queue_id,
+ struct rte_eth_rxq_info *qinfo)
+{
+   struct otx2_eth_rxq *rxq;
+
+   rxq = eth_dev->data->rx_queues[queue_id];
+
+   qinfo->mp = rxq->pool;
+   qinfo->scattered_rx = eth_dev->data->scattered_rx;
+   qinfo->nb_desc = rxq->qconf.nb_desc;
+
+   qinfo->conf.rx_free_thresh = 0;
+   qinfo->conf.rx_drop_en = 0;
+   qinfo->conf.rx_deferred_start = 0;
+   qinfo->conf.offloads = rxq->offloads;
+}
+
+void
+otx2_nix_txq_info_get(struct rte_eth_dev *eth_dev, uint16_t queue_id,
+ struct rte_eth_txq_info *qinfo)
+{
+   struct otx2_eth_txq *txq;
+
+   txq = eth_dev->data->tx_queues[queue_id];
+
+   qinfo->nb_desc = txq->qconf.nb_desc;
+
+   qinfo->conf.tx_thresh.pthresh = 0;
+   qinfo->conf.tx_thresh.hthresh = 0;
+   qinfo->conf.tx_thresh.wthresh = 0;
+
+   qinfo->conf.tx_free_thresh = 0;
+   qinfo->conf.tx_rs_thresh = 0;
+   qinfo->conf.offloads = txq->offloads;
+   qinfo->conf.tx_deferred_start = 0;
+}
+
+int
+otx2_nix_pool_ops_supported(struct rte_eth_dev *eth_dev, const char *pool)
+{
+   RTE_SET_USED(eth_dev);
+
+   if (!strcmp(pool, rte_mbuf_platform_mempool_ops()))
+   return 0;
+
+   return -ENOTSUP;
+}
+
 void
 otx2_nix_info_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info 
*devinfo)
 {
-- 
2.21.0

[dpdk-dev] [PATCH v2 24/57] net/octeontx2: enable Tx through traffic manager

[jerinj]

From: Krzysztof Kanas 

This patch enables pkt transmit through traffic manager
hierarchy by clearing software XOFF on the nodes and linking
tx queues to corresponding leaf nodes.
It also adds support to start and stop tx queue using
traffic manager.

Signed-off-by: Krzysztof Kanas 
Signed-off-by: Nithin Dabilpuram 
Signed-off-by: Vamsi Attunuru 
---
 drivers/net/octeontx2/otx2_ethdev.c |  75 ++-
 drivers/net/octeontx2/otx2_tm.c | 296 +++-
 drivers/net/octeontx2/otx2_tm.h |   4 +
 3 files changed, 370 insertions(+), 5 deletions(-)

diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 899865749..62b1e3d14 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -120,6 +120,32 @@ nix_lf_free(struct otx2_eth_dev *dev)
return otx2_mbox_process(mbox);
 }
 
+int
+otx2_cgx_rxtx_start(struct otx2_eth_dev *dev)
+{
+   struct otx2_mbox *mbox = dev->mbox;
+
+   if (otx2_dev_is_vf(dev))
+   return 0;
+
+   otx2_mbox_alloc_msg_cgx_start_rxtx(mbox);
+
+   return otx2_mbox_process(mbox);
+}
+
+int
+otx2_cgx_rxtx_stop(struct otx2_eth_dev *dev)
+{
+   struct otx2_mbox *mbox = dev->mbox;
+
+   if (otx2_dev_is_vf(dev))
+   return 0;
+
+   otx2_mbox_alloc_msg_cgx_stop_rxtx(mbox);
+
+   return otx2_mbox_process(mbox);
+}
+
 static inline void
 nix_rx_queue_reset(struct otx2_eth_rxq *rxq)
 {
@@ -461,16 +487,27 @@ nix_sq_init(struct otx2_eth_txq *txq)
struct otx2_eth_dev *dev = txq->dev;
struct otx2_mbox *mbox = dev->mbox;
struct nix_aq_enq_req *sq;
+   uint32_t rr_quantum;
+   uint16_t smq;
+   int rc;
 
if (txq->sqb_pool->pool_id == 0)
return -EINVAL;
 
+   rc = otx2_nix_tm_get_leaf_data(dev, txq->sq, &rr_quantum, &smq);
+   if (rc) {
+   otx2_err("Failed to get sq->smq(leaf node), rc=%d", rc);
+   return rc;
+   }
+
sq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
sq->qidx = txq->sq;
sq->ctype = NIX_AQ_CTYPE_SQ;
sq->op = NIX_AQ_INSTOP_INIT;
sq->sq.max_sqe_size = nix_sq_max_sqe_sz(txq);
 
+   sq->sq.smq = smq;
+   sq->sq.smq_rr_quantum = rr_quantum;
sq->sq.default_chan = dev->tx_chan_base;
sq->sq.sqe_stype = NIX_STYPE_STF;
sq->sq.ena = 1;
@@ -692,12 +729,18 @@ static void
 otx2_nix_tx_queue_release(void *_txq)
 {
struct otx2_eth_txq *txq = _txq;
+   struct rte_eth_dev *eth_dev;
 
if (!txq)
return;
 
+   eth_dev = txq->dev->eth_dev;
+
otx2_nix_dbg("Releasing txq %u", txq->sq);
 
+   /* Flush and disable tm */
+   otx2_nix_tm_sw_xoff(txq, eth_dev->data->dev_started);
+
/* Free sqb's and disable sq */
nix_sq_uninit(txq);
 
@@ -1123,24 +1166,52 @@ int
 otx2_nix_tx_queue_start(struct rte_eth_dev *eth_dev, uint16_t qidx)
 {
struct rte_eth_dev_data *data = eth_dev->data;
+   struct otx2_eth_txq *txq;
+   int rc = -EINVAL;
+
+   txq = eth_dev->data->tx_queues[qidx];
 
if (data->tx_queue_state[qidx] == RTE_ETH_QUEUE_STATE_STARTED)
return 0;
 
+   rc = otx2_nix_sq_sqb_aura_fc(txq, true);
+   if (rc) {
+   otx2_err("Failed to enable sqb aura fc, txq=%u, rc=%d",
+qidx, rc);
+   goto done;
+   }
+
data->tx_queue_state[qidx] = RTE_ETH_QUEUE_STATE_STARTED;
-   return 0;
+
+done:
+   return rc;
 }
 
 int
 otx2_nix_tx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t qidx)
 {
struct rte_eth_dev_data *data = eth_dev->data;
+   struct otx2_eth_txq *txq;
+   int rc;
+
+   txq = eth_dev->data->tx_queues[qidx];
 
if (data->tx_queue_state[qidx] == RTE_ETH_QUEUE_STATE_STOPPED)
return 0;
 
+   txq->fc_cache_pkts = 0;
+
+   rc = otx2_nix_sq_sqb_aura_fc(txq, false);
+   if (rc) {
+   otx2_err("Failed to disable sqb aura fc, txq=%u, rc=%d",
+qidx, rc);
+   goto done;
+   }
+
data->tx_queue_state[qidx] = RTE_ETH_QUEUE_STATE_STOPPED;
-   return 0;
+
+done:
+   return rc;
 }
 
 static int
diff --git a/drivers/net/octeontx2/otx2_tm.c b/drivers/net/octeontx2/otx2_tm.c
index c6154e4d4..246920695 100644
--- a/drivers/net/octeontx2/otx2_tm.c
+++ b/drivers/net/octeontx2/otx2_tm.c
@@ -676,6 +676,224 @@ nix_tm_clear_shaper_profiles(struct otx2_eth_dev *dev)
return 0;
 }
 
+static int
+nix_smq_xoff(struct otx2_eth_dev *dev, uint16_t smq, bool enable)
+{
+   struct otx2_mbox *mbox = dev->mbox;
+   struct nix_txschq_config *req;
+
+   req = otx2_mbox_alloc_msg_nix_txschq_cfg(mbox);
+   req->lvl = NIX_TXSCH_LVL_SMQ;
+   req->num_regs = 1;
+
+   req->reg[0] = NIX_AF_SMQX_CFG(smq);
+   /* Unmodified fields */
+   req->regval[0] = ((uint64_t)NIX_MAX_VTAG_INS << 36) |
+  

[dpdk-dev] [PATCH v2 25/57] net/octeontx2: add ptype support

[jerinj]

From: Jerin Jacob 

The fields from CQE needs to be converted to
ptype and rx ol flags in mbuf. This patch adds
create lookup memory for those items to be
used in Fastpath.

Signed-off-by: Jerin Jacob 
Signed-off-by: Kiran Kumar K 
Signed-off-by: Harman Kalra 
---
 doc/guides/nics/features/octeontx2.ini |   1 +
 doc/guides/nics/features/octeontx2_vec.ini |   1 +
 doc/guides/nics/features/octeontx2_vf.ini  |   1 +
 doc/guides/nics/octeontx2.rst  |   1 +
 drivers/net/octeontx2/Makefile |   1 +
 drivers/net/octeontx2/meson.build  |   1 +
 drivers/net/octeontx2/otx2_ethdev.c|   2 +
 drivers/net/octeontx2/otx2_ethdev.h|   6 +
 drivers/net/octeontx2/otx2_lookup.c| 315 +
 drivers/net/octeontx2/otx2_rx.h|   7 +
 10 files changed, 336 insertions(+)
 create mode 100644 drivers/net/octeontx2/otx2_lookup.c

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index ca40358da..0de07776f 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -20,6 +20,7 @@ RSS hash = Y
 RSS key update   = Y
 RSS reta update  = Y
 Inner RSS= Y
+Packet type parsing  = Y
 Basic stats  = Y
 Stats per queue  = Y
 Extended stats   = Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index b720c116f..b4b253aa4 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -20,6 +20,7 @@ RSS hash = Y
 RSS key update   = Y
 RSS reta update  = Y
 Inner RSS= Y
+Packet type parsing  = Y
 Basic stats  = Y
 Extended stats   = Y
 Stats per queue  = Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
index 5a287493f..21cc4861e 100644
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -16,6 +16,7 @@ RSS hash = Y
 RSS key update   = Y
 RSS reta update  = Y
 Inner RSS= Y
+Packet type parsing  = Y
 Basic stats  = Y
 Extended stats   = Y
 Stats per queue  = Y
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index d7e8f3d56..07e44b031 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -16,6 +16,7 @@ Features
 
 Features of the OCTEON TX2 Ethdev PMD are:
 
+- Packet type information
 - Promiscuous mode
 - SR-IOV VF
 - Lock-free Tx queue
diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index 164621087..d434b0b9d 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -33,6 +33,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
otx2_mac.c  \
otx2_link.c \
otx2_stats.c\
+   otx2_lookup.c   \
otx2_ethdev.c   \
otx2_ethdev_irq.c \
otx2_ethdev_ops.c \
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index e344d877f..3dff3e53d 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -8,6 +8,7 @@ sources = files(
'otx2_mac.c',
'otx2_link.c',
'otx2_stats.c',
+   'otx2_lookup.c',
'otx2_ethdev.c',
'otx2_ethdev_irq.c',
'otx2_ethdev_ops.c',
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 62b1e3d14..a9cdafc33 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -441,6 +441,7 @@ otx2_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, 
uint16_t rq,
rxq->pool = mp;
rxq->qlen = nix_qsize_to_val(qsize);
rxq->qsize = qsize;
+   rxq->lookup_mem = otx2_nix_fastpath_lookup_mem_get();
 
/* Alloc completion queue */
rc = nix_cq_rq_init(eth_dev, dev, rq, rxq, mp);
@@ -1271,6 +1272,7 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.tx_queue_stop= otx2_nix_tx_queue_stop,
.rx_queue_start   = otx2_nix_rx_queue_start,
.rx_queue_stop= otx2_nix_rx_queue_stop,
+   .dev_supported_ptypes_get = otx2_nix_supported_ptypes_get,
.stats_get= otx2_nix_dev_stats_get,
.stats_reset  = otx2_nix_dev_stats_reset,
.get_reg  = otx2_nix_dev_get_reg,
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 9f73bf89b..cfc4dfe14 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -355,6 +355,12 @@ int otx2_cgx_rxtx_stop(struct otx2_eth_dev *dev);
 int otx2_cgx_mac_addr_set(struct rte_eth_dev *eth_dev,
  struct rte_ether_addr *addr);
 
+/* Lookup configuration */
+void *otx2_nix_fastpath_lookup_mem_ge

[dpdk-dev] [PATCH v2 29/57] net/octeontx2: add flow control support

[jerinj]

From: Vamsi Attunuru 

Add flow control operations and exposed
otx2_nix_update_flow_ctrl_mode() to enable on the
configured mode in dev_start().

Signed-off-by: Vamsi Attunuru 
Signed-off-by: Nithin Dabilpuram 
---
 doc/guides/nics/features/octeontx2.ini |   1 +
 doc/guides/nics/features/octeontx2_vec.ini |   1 +
 doc/guides/nics/octeontx2.rst  |   1 +
 drivers/net/octeontx2/Makefile |   1 +
 drivers/net/octeontx2/meson.build  |   1 +
 drivers/net/octeontx2/otx2_ethdev.c|  20 ++
 drivers/net/octeontx2/otx2_ethdev.h|  23 +++
 drivers/net/octeontx2/otx2_flow_ctrl.c | 220 +
 8 files changed, 268 insertions(+)
 create mode 100644 drivers/net/octeontx2/otx2_flow_ctrl.c

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index 87141244a..00feb0cf2 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -21,6 +21,7 @@ RSS hash = Y
 RSS key update   = Y
 RSS reta update  = Y
 Inner RSS= Y
+Flow control = Y
 Packet type parsing  = Y
 Rx descriptor status = Y
 Basic stats  = Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index dafbe003c..f3f812804 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -21,6 +21,7 @@ RSS hash = Y
 RSS key update   = Y
 RSS reta update  = Y
 Inner RSS= Y
+Flow control = Y
 Packet type parsing  = Y
 Rx descriptor status = Y
 Basic stats  = Y
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index 07e44b031..20281b030 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -25,6 +25,7 @@ Features of the OCTEON TX2 Ethdev PMD are:
 - MAC filtering
 - Port hardware statistics
 - Link state information
+- Link flow control
 - Debug utilities - Context dump and error interrupt support
 
 Prerequisites
diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index d434b0b9d..4a361846f 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -35,6 +35,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
otx2_stats.c\
otx2_lookup.c   \
otx2_ethdev.c   \
+   otx2_flow_ctrl.c \
otx2_ethdev_irq.c \
otx2_ethdev_ops.c \
otx2_ethdev_debug.c \
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index 3dff3e53d..4b56f4461 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -10,6 +10,7 @@ sources = files(
'otx2_stats.c',
'otx2_lookup.c',
'otx2_ethdev.c',
+   'otx2_flow_ctrl.c',
'otx2_ethdev_irq.c',
'otx2_ethdev_ops.c',
'otx2_ethdev_debug.c',
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 58c2f97b5..19b502903 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -216,6 +216,14 @@ nix_cq_rq_init(struct rte_eth_dev *eth_dev, struct 
otx2_eth_dev *dev,
aq->cq.cq_err_int_ena = BIT(NIX_CQERRINT_CQE_FAULT);
aq->cq.cq_err_int_ena |= BIT(NIX_CQERRINT_DOOR_ERR);
 
+   /* TX pause frames enable flowctrl on RX side */
+   if (dev->fc_info.tx_pause) {
+   /* Single bpid is allocated for all rx channels for now */
+   aq->cq.bpid = dev->fc_info.bpid[0];
+   aq->cq.bp = NIX_CQ_BP_LEVEL;
+   aq->cq.bp_ena = 1;
+   }
+
/* Many to one reduction */
aq->cq.qint_idx = qid % dev->qints;
 
@@ -1073,6 +1081,7 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
 
/* Free the resources allocated from the previous configure */
if (dev->configured == 1) {
+   otx2_nix_rxchan_bpid_cfg(eth_dev, false);
oxt2_nix_unregister_queue_irqs(eth_dev);
nix_set_nop_rxtx_function(eth_dev);
rc = nix_store_queue_cfg_and_then_release(eth_dev);
@@ -1126,6 +1135,12 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
goto free_nix_lf;
}
 
+   rc = otx2_nix_rxchan_bpid_cfg(eth_dev, true);
+   if (rc) {
+   otx2_err("Failed to configure nix rx chan bpid cfg rc=%d", rc);
+   goto free_nix_lf;
+   }
+
/*
 * Restore queue config when reconfigure followed by
 * reconfigure and no queue configure invoked from application case.
@@ -1302,6 +1317,8 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.pool_ops_supported   = otx2_nix_pool_ops_supported,
.get_module_info  = otx2_nix_get_module_info,
.get_module_eeprom= otx2_nix_get_module_eeprom,
+   .flow_ctrl_get= otx2_nix_flow_ctrl

[dpdk-dev] [PATCH v2 28/57] net/octeontx2: add module EEPROM dump

[jerinj]

From: Vamsi Attunuru 

add module EEPROM dump operation.

Signed-off-by: Vamsi Attunuru 
---
 doc/guides/nics/features/octeontx2.ini |  1 +
 doc/guides/nics/features/octeontx2_vec.ini |  1 +
 doc/guides/nics/features/octeontx2_vf.ini  |  1 +
 drivers/net/octeontx2/otx2_ethdev.c|  2 +
 drivers/net/octeontx2/otx2_ethdev.h|  4 ++
 drivers/net/octeontx2/otx2_ethdev_ops.c| 51 ++
 6 files changed, 60 insertions(+)

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index f07b64f24..87141244a 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -26,6 +26,7 @@ Rx descriptor status = Y
 Basic stats  = Y
 Stats per queue  = Y
 Extended stats   = Y
+Module EEPROM dump   = Y
 Registers dump   = Y
 Linux VFIO   = Y
 ARMv8= Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index 911c926e4..dafbe003c 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -26,6 +26,7 @@ Rx descriptor status = Y
 Basic stats  = Y
 Extended stats   = Y
 Stats per queue  = Y
+Module EEPROM dump   = Y
 Registers dump   = Y
 Linux VFIO   = Y
 ARMv8= Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
index e275e6469..7fba7e1d9 100644
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -22,6 +22,7 @@ Rx descriptor status = Y
 Basic stats  = Y
 Extended stats   = Y
 Stats per queue  = Y
+Module EEPROM dump   = Y
 Registers dump   = Y
 Linux VFIO   = Y
 ARMv8= Y
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index feeba5c96..58c2f97b5 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -1300,6 +1300,8 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.rx_descriptor_status = otx2_nix_rx_descriptor_status,
.tx_done_cleanup  = otx2_nix_tx_done_cleanup,
.pool_ops_supported   = otx2_nix_pool_ops_supported,
+   .get_module_info  = otx2_nix_get_module_info,
+   .get_module_eeprom= otx2_nix_get_module_eeprom,
 };
 
 static inline int
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 8f2691c80..5dd5d8c8b 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -274,6 +274,10 @@ otx2_eth_pmd_priv(struct rte_eth_dev *eth_dev)
 /* Ops */
 void otx2_nix_info_get(struct rte_eth_dev *eth_dev,
   struct rte_eth_dev_info *dev_info);
+int otx2_nix_get_module_info(struct rte_eth_dev *eth_dev,
+struct rte_eth_dev_module_info *modinfo);
+int otx2_nix_get_module_eeprom(struct rte_eth_dev *eth_dev,
+  struct rte_dev_eeprom_info *info);
 int otx2_nix_pool_ops_supported(struct rte_eth_dev *eth_dev, const char *pool);
 void otx2_nix_rxq_info_get(struct rte_eth_dev *eth_dev, uint16_t queue_id,
   struct rte_eth_rxq_info *qinfo);
diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c 
b/drivers/net/octeontx2/otx2_ethdev_ops.c
index 44cc17200..2a949439a 100644
--- a/drivers/net/octeontx2/otx2_ethdev_ops.c
+++ b/drivers/net/octeontx2/otx2_ethdev_ops.c
@@ -220,6 +220,57 @@ otx2_nix_pool_ops_supported(struct rte_eth_dev *eth_dev, 
const char *pool)
return -ENOTSUP;
 }
 
+static struct cgx_fw_data *
+nix_get_fwdata(struct otx2_eth_dev *dev)
+{
+   struct otx2_mbox *mbox = dev->mbox;
+   struct cgx_fw_data *rsp = NULL;
+
+   otx2_mbox_alloc_msg_cgx_get_aux_link_info(mbox);
+
+   otx2_mbox_process_msg(mbox, (void *)&rsp);
+
+   return rsp;
+}
+
+int
+otx2_nix_get_module_info(struct rte_eth_dev *eth_dev,
+struct rte_eth_dev_module_info *modinfo)
+{
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+   struct cgx_fw_data *rsp;
+
+   rsp = nix_get_fwdata(dev);
+   if (rsp == NULL)
+   return -EIO;
+
+   modinfo->type = rsp->fwdata.sfp_eeprom.sff_id;
+   modinfo->eeprom_len = SFP_EEPROM_SIZE;
+
+   return 0;
+}
+
+int
+otx2_nix_get_module_eeprom(struct rte_eth_dev *eth_dev,
+  struct rte_dev_eeprom_info *info)
+{
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+   struct cgx_fw_data *rsp;
+
+   if (!info->data || !info->length ||
+   (info->offset + info->length > SFP_EEPROM_SIZE))
+   return -EINVAL;
+
+   rsp = nix_get_fwdata(dev);
+   if (rsp == NULL)
+   return -EIO;
+
+   otx2_mbox_memcpy(info->data, rsp->fwdata.sfp_eeprom.buf + info->offset,
+info->length);
+
+   return 0;
+}

[dpdk-dev] [PATCH v2 36/57] net/octeontx2: add flow parsing for outer layers

[jerinj]

From: Kiran Kumar K 

Adding functionality to parse outer layers from ld to lh.
These will be used parse outer layers L2, L3, L4 and tunnel types.

Signed-off-by: Kiran Kumar K 
Signed-off-by: Vivek Sharma 
---
 drivers/net/octeontx2/Makefile  |   1 +
 drivers/net/octeontx2/meson.build   |   1 +
 drivers/net/octeontx2/otx2_flow_parse.c | 459 
 3 files changed, 461 insertions(+)
 create mode 100644 drivers/net/octeontx2/otx2_flow_parse.c

diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index 8d1aeae3f..3eb4dba53 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -37,6 +37,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
otx2_lookup.c   \
otx2_ethdev.c   \
otx2_flow_ctrl.c \
+   otx2_flow_parse.c \
otx2_flow_utils.c \
otx2_ethdev_irq.c \
otx2_ethdev_ops.c \
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index 75156ddbe..f608c4947 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -12,6 +12,7 @@ sources = files(
'otx2_lookup.c',
'otx2_ethdev.c',
'otx2_flow_ctrl.c',
+   'otx2_flow_parse.c',
'otx2_flow_utils.c',
'otx2_ethdev_irq.c',
'otx2_ethdev_ops.c',
diff --git a/drivers/net/octeontx2/otx2_flow_parse.c 
b/drivers/net/octeontx2/otx2_flow_parse.c
new file mode 100644
index 0..d27a24833
--- /dev/null
+++ b/drivers/net/octeontx2/otx2_flow_parse.c
@@ -0,0 +1,459 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2019 Marvell International Ltd.
+ */
+
+#include "otx2_ethdev.h"
+#include "otx2_flow.h"
+
+const struct rte_flow_item *
+otx2_flow_skip_void_and_any_items(const struct rte_flow_item *pattern)
+{
+   while ((pattern->type == RTE_FLOW_ITEM_TYPE_VOID) ||
+  (pattern->type == RTE_FLOW_ITEM_TYPE_ANY))
+   pattern++;
+
+   return pattern;
+}
+
+/*
+ * Tunnel+ESP, Tunnel+ICMP4/6, Tunnel+TCP, Tunnel+UDP,
+ * Tunnel+SCTP
+ */
+int
+otx2_flow_parse_lh(struct otx2_parse_state *pst)
+{
+   struct otx2_flow_item_info info;
+   char hw_mask[64];
+   int lid, lt;
+   int rc;
+
+   if (!pst->tunnel)
+   return 0;
+
+   info.hw_mask = &hw_mask;
+   info.spec = NULL;
+   info.mask = NULL;
+   info.hw_hdr_len = 0;
+   lid = NPC_LID_LH;
+
+   switch (pst->pattern->type) {
+   case RTE_FLOW_ITEM_TYPE_UDP:
+   lt = NPC_LT_LH_TU_UDP;
+   info.def_mask = &rte_flow_item_udp_mask;
+   info.len = sizeof(struct rte_flow_item_udp);
+   break;
+   case RTE_FLOW_ITEM_TYPE_TCP:
+   lt = NPC_LT_LH_TU_TCP;
+   info.def_mask = &rte_flow_item_tcp_mask;
+   info.len = sizeof(struct rte_flow_item_tcp);
+   break;
+   case RTE_FLOW_ITEM_TYPE_SCTP:
+   lt = NPC_LT_LH_TU_SCTP;
+   info.def_mask = &rte_flow_item_sctp_mask;
+   info.len = sizeof(struct rte_flow_item_sctp);
+   break;
+   case RTE_FLOW_ITEM_TYPE_ESP:
+   lt = NPC_LT_LH_TU_ESP;
+   info.def_mask = &rte_flow_item_esp_mask;
+   info.len = sizeof(struct rte_flow_item_esp);
+   break;
+   default:
+   return 0;
+   }
+
+   otx2_flow_get_hw_supp_mask(pst, &info, lid, lt);
+   rc = otx2_flow_parse_item_basic(pst->pattern, &info, pst->error);
+   if (rc != 0)
+   return rc;
+
+   return otx2_flow_update_parse_state(pst, &info, lid, lt, 0);
+}
+
+/* Tunnel+IPv4, Tunnel+IPv6 */
+int
+otx2_flow_parse_lg(struct otx2_parse_state *pst)
+{
+   struct otx2_flow_item_info info;
+   char hw_mask[64];
+   int lid, lt;
+   int rc;
+
+   if (!pst->tunnel)
+   return 0;
+
+   info.hw_mask = &hw_mask;
+   info.spec = NULL;
+   info.mask = NULL;
+   info.hw_hdr_len = 0;
+   lid = NPC_LID_LG;
+
+   if (pst->pattern->type == RTE_FLOW_ITEM_TYPE_IPV4) {
+   lt = NPC_LT_LG_TU_IP;
+   info.def_mask = &rte_flow_item_ipv4_mask;
+   info.len = sizeof(struct rte_flow_item_ipv4);
+   } else if (pst->pattern->type == RTE_FLOW_ITEM_TYPE_IPV6) {
+   lt = NPC_LT_LG_TU_IP6;
+   info.def_mask = &rte_flow_item_ipv6_mask;
+   info.len = sizeof(struct rte_flow_item_ipv6);
+   } else {
+   /* There is no tunneled IP header */
+   return 0;
+   }
+
+   otx2_flow_get_hw_supp_mask(pst, &info, lid, lt);
+   rc = otx2_flow_parse_item_basic(pst->pattern, &info, pst->error);
+   if (rc != 0)
+   return rc;
+
+   return otx2_flow_update_parse_state(pst, &info, lid, lt, 0);
+}
+
+/* Tunnel+Ether */
+int
+otx2_flow_parse_lf(struct otx2_parse_state *pst)
+{
+

[dpdk-dev] [PATCH v2 37/57] net/octeontx2: add flow actions support

[jerinj]

From: Kiran Kumar K 

Adding support to parse flow actions like drop, count, mark, rss, queue.
On egress side, only drop and count actions were supported.

Signed-off-by: Kiran Kumar K 
Signed-off-by: Vivek Sharma 
---
 drivers/net/octeontx2/otx2_flow_parse.c | 210 
 1 file changed, 210 insertions(+)

diff --git a/drivers/net/octeontx2/otx2_flow_parse.c 
b/drivers/net/octeontx2/otx2_flow_parse.c
index d27a24833..79c60a9ea 100644
--- a/drivers/net/octeontx2/otx2_flow_parse.c
+++ b/drivers/net/octeontx2/otx2_flow_parse.c
@@ -457,3 +457,213 @@ otx2_flow_parse_ld(struct otx2_parse_state *pst)
 
return otx2_flow_update_parse_state(pst, &info, lid, lt, lflags);
 }
+
+static inline void
+flow_check_lc_ip_tunnel(struct otx2_parse_state *pst)
+{
+   const struct rte_flow_item *pattern = pst->pattern + 1;
+
+   pattern = otx2_flow_skip_void_and_any_items(pattern);
+   if (pattern->type == RTE_FLOW_ITEM_TYPE_MPLS ||
+   pattern->type == RTE_FLOW_ITEM_TYPE_IPV4 ||
+   pattern->type == RTE_FLOW_ITEM_TYPE_IPV6)
+   pst->tunnel = 1;
+}
+
+/* Outer IPv4, Outer IPv6, MPLS, ARP */
+int
+otx2_flow_parse_lc(struct otx2_parse_state *pst)
+{
+   uint8_t hw_mask[NPC_MAX_EXTRACT_DATA_LEN];
+   struct otx2_flow_item_info info;
+   int lid, lt;
+   int rc;
+
+   if (pst->pattern->type == RTE_FLOW_ITEM_TYPE_MPLS)
+   return otx2_flow_parse_mpls(pst, NPC_LID_LC);
+
+   info.hw_mask = &hw_mask;
+   info.spec = NULL;
+   info.mask = NULL;
+   info.hw_hdr_len = 0;
+   lid = NPC_LID_LC;
+
+   switch (pst->pattern->type) {
+   case RTE_FLOW_ITEM_TYPE_IPV4:
+   lt = NPC_LT_LC_IP;
+   info.def_mask = &rte_flow_item_ipv4_mask;
+   info.len = sizeof(struct rte_flow_item_ipv4);
+   break;
+   case RTE_FLOW_ITEM_TYPE_IPV6:
+   lid = NPC_LID_LC;
+   lt = NPC_LT_LC_IP6;
+   info.def_mask = &rte_flow_item_ipv6_mask;
+   info.len = sizeof(struct rte_flow_item_ipv6);
+   break;
+   case RTE_FLOW_ITEM_TYPE_ARP_ETH_IPV4:
+   lt = NPC_LT_LC_ARP;
+   info.def_mask = &rte_flow_item_arp_eth_ipv4_mask;
+   info.len = sizeof(struct rte_flow_item_arp_eth_ipv4);
+   break;
+   default:
+   /* No match at this layer */
+   return 0;
+   }
+
+   /* Identify if IP tunnels MPLS or IPv4/v6 */
+   flow_check_lc_ip_tunnel(pst);
+
+   otx2_flow_get_hw_supp_mask(pst, &info, lid, lt);
+   rc = otx2_flow_parse_item_basic(pst->pattern, &info, pst->error);
+   if (rc != 0)
+   return rc;
+
+   return otx2_flow_update_parse_state(pst, &info, lid, lt, 0);
+}
+
+/* VLAN, ETAG */
+int
+otx2_flow_parse_lb(struct otx2_parse_state *pst)
+{
+   const struct rte_flow_item *pattern = pst->pattern;
+   const struct rte_flow_item *last_pattern;
+   char hw_mask[NPC_MAX_EXTRACT_DATA_LEN];
+   struct otx2_flow_item_info info;
+   int lid, lt, lflags;
+   int nr_vlans = 0;
+   int rc;
+
+   info.spec = NULL;
+   info.mask = NULL;
+   info.hw_hdr_len = NPC_TPID_LENGTH;
+
+   lid = NPC_LID_LB;
+   lflags = 0;
+   last_pattern = pattern;
+
+   if (pst->pattern->type == RTE_FLOW_ITEM_TYPE_VLAN) {
+   /* RTE vlan is either 802.1q or 802.1ad,
+* this maps to either CTAG/STAG. We need to decide
+* based on number of VLANS present. Matching is
+* supported on first tag only.
+*/
+   info.def_mask = &rte_flow_item_vlan_mask;
+   info.hw_mask = NULL;
+   info.len = sizeof(struct rte_flow_item_vlan);
+
+   pattern = pst->pattern;
+   while (pattern->type == RTE_FLOW_ITEM_TYPE_VLAN) {
+   nr_vlans++;
+
+   /* Basic validation of 2nd/3rd vlan item */
+   if (nr_vlans > 1) {
+   otx2_npc_dbg("Vlans  = %d", nr_vlans);
+   rc = otx2_flow_parse_item_basic(pattern, &info,
+   pst->error);
+   if (rc != 0)
+   return rc;
+   }
+   last_pattern = pattern;
+   pattern++;
+   pattern = otx2_flow_skip_void_and_any_items(pattern);
+   }
+
+   switch (nr_vlans) {
+   case 1:
+   lt = NPC_LT_LB_CTAG;
+   break;
+   case 2:
+   lt = NPC_LT_LB_STAG;
+   lflags = NPC_F_STAG_CTAG;
+   break;
+   case 3:
+   lt = NPC_LT_LB_STAG;
+   lflags = NPC_F_STAG_STAG_CTAG

[dpdk-dev] [PATCH v2 38/57] net/octeontx2: add flow parse actions support

[jerinj]

From: Kiran Kumar K 

Adding support to parse flow actions like drop, count, mark, rss, queue.
On egress side, only drop and count actions were supported.

Signed-off-by: Kiran Kumar K 
Signed-off-by: Vivek Sharma 
---
 drivers/net/octeontx2/otx2_flow_parse.c | 276 
 drivers/net/octeontx2/otx2_rx.h |   1 +
 2 files changed, 277 insertions(+)

diff --git a/drivers/net/octeontx2/otx2_flow_parse.c 
b/drivers/net/octeontx2/otx2_flow_parse.c
index 79c60a9ea..4cf5ce17e 100644
--- a/drivers/net/octeontx2/otx2_flow_parse.c
+++ b/drivers/net/octeontx2/otx2_flow_parse.c
@@ -667,3 +667,279 @@ otx2_flow_parse_la(struct otx2_parse_state *pst)
/* Update pst if not validate only? clash check? */
return otx2_flow_update_parse_state(pst, &info, lid, lt, 0);
 }
+
+static int
+parse_rss_action(struct rte_eth_dev *dev,
+const struct rte_flow_attr *attr,
+const struct rte_flow_action *act,
+struct rte_flow_error *error)
+{
+   struct otx2_eth_dev *hw = dev->data->dev_private;
+   struct otx2_rss_info *rss_info = &hw->rss_info;
+   const struct rte_flow_action_rss *rss;
+   uint32_t i;
+
+   rss = (const struct rte_flow_action_rss *)act->conf;
+
+   /* Not supported */
+   if (attr->egress) {
+   return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ATTR_EGRESS,
+ attr, "No support of RSS in egress");
+   }
+
+   if (dev->data->dev_conf.rxmode.mq_mode != ETH_MQ_RX_RSS)
+   return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION,
+ act, "multi-queue mode is disabled");
+
+   /* Parse RSS related parameters from configuration */
+   if (!rss || !rss->queue_num)
+   return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION,
+ act, "no valid queues");
+
+   if (rss->func != RTE_ETH_HASH_FUNCTION_DEFAULT)
+   return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION, act,
+ "non-default RSS hash functions"
+ " are not supported");
+
+   if (rss->key_len && rss->key_len > RTE_DIM(rss_info->key))
+   return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION, act,
+ "RSS hash key too large");
+
+   if (rss->queue_num > rss_info->rss_size)
+   return rte_flow_error_set
+   (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, act,
+"too many queues for RSS context");
+
+   for (i = 0; i < rss->queue_num; i++) {
+   if (rss->queue[i] >= dev->data->nb_rx_queues)
+   return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION,
+ act,
+ "queue id > max number"
+ " of queues");
+   }
+
+   return 0;
+}
+
+int
+otx2_flow_parse_actions(struct rte_eth_dev *dev,
+   const struct rte_flow_attr *attr,
+   const struct rte_flow_action actions[],
+   struct rte_flow_error *error,
+   struct rte_flow *flow)
+{
+   struct otx2_eth_dev *hw = dev->data->dev_private;
+   struct otx2_npc_flow_info *npc = &hw->npc_flow;
+   const struct rte_flow_action_count *act_count;
+   const struct rte_flow_action_mark *act_mark;
+   const struct rte_flow_action_queue *act_q;
+   const char *errmsg = NULL;
+   int sel_act, req_act = 0;
+   uint16_t pf_func;
+   int errcode = 0;
+   int mark = 0;
+   int rq = 0;
+
+   /* Initialize actions */
+   flow->ctr_id = NPC_COUNTER_NONE;
+
+   for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) {
+   otx2_npc_dbg("Action type = %d", actions->type);
+
+   switch (actions->type) {
+   case RTE_FLOW_ACTION_TYPE_VOID:
+   break;
+   case RTE_FLOW_ACTION_TYPE_MARK:
+   act_mark =
+   (const struct rte_flow_action_mark *)actions->conf;
+
+   /* We have only 16 bits. Use highest val for flag */
+   if (act_mark->id > (OTX2_FLOW_FLAG_VAL - 2)) {
+   errmsg = "mark value must be < 0xfffe";
+   errcode = ENOTSUP;
+   goto err_exit;
+   }
+  

[dpdk-dev] [PATCH v2 39/57] net/octeontx2: add flow operations

[jerinj]

From: Kiran Kumar K 

Adding the initial flow ops like flow_create and flow_validate.
These will be used to alloc and write flow rule to device and
validate the flow rule.

Signed-off-by: Kiran Kumar K 
Signed-off-by: Vivek Sharma 
---
 drivers/net/octeontx2/Makefile|   1 +
 drivers/net/octeontx2/meson.build |   1 +
 drivers/net/octeontx2/otx2_flow.c | 451 ++
 3 files changed, 453 insertions(+)
 create mode 100644 drivers/net/octeontx2/otx2_flow.c

diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index 3eb4dba53..21559f631 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -32,6 +32,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
otx2_rss.c  \
otx2_mac.c  \
otx2_ptp.c  \
+   otx2_flow.c \
otx2_link.c \
otx2_stats.c\
otx2_lookup.c   \
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index f608c4947..f0e03bffe 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -7,6 +7,7 @@ sources = files(
'otx2_rss.c',
'otx2_mac.c',
'otx2_ptp.c',
+   'otx2_flow.c',
'otx2_link.c',
'otx2_stats.c',
'otx2_lookup.c',
diff --git a/drivers/net/octeontx2/otx2_flow.c 
b/drivers/net/octeontx2/otx2_flow.c
new file mode 100644
index 0..896aef00a
--- /dev/null
+++ b/drivers/net/octeontx2/otx2_flow.c
@@ -0,0 +1,451 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2019 Marvell International Ltd.
+ */
+
+#include "otx2_ethdev.h"
+#include "otx2_flow.h"
+
+static int
+flow_program_npc(struct otx2_parse_state *pst, struct otx2_mbox *mbox,
+struct otx2_npc_flow_info *flow_info)
+{
+   /* This is non-LDATA part in search key */
+   uint64_t key_data[2] = {0ULL, 0ULL};
+   uint64_t key_mask[2] = {0ULL, 0ULL};
+   int intf = pst->flow->nix_intf;
+   int key_len, bit = 0, index;
+   int off, idx, data_off = 0;
+   uint8_t lid, mask, data;
+   uint16_t layer_info;
+   uint64_t lt, flags;
+
+
+   /* Skip till Layer A data start */
+   while (bit < NPC_PARSE_KEX_S_LA_OFFSET) {
+   if (flow_info->keyx_supp_nmask[intf] & (1 << bit))
+   data_off++;
+   bit++;
+   }
+
+   /* Each bit represents 1 nibble */
+   data_off *= 4;
+
+   index = 0;
+   for (lid = 0; lid < NPC_MAX_LID; lid++) {
+   /* Offset in key */
+   off = NPC_PARSE_KEX_S_LID_OFFSET(lid);
+   lt = pst->lt[lid] & 0xf;
+   flags = pst->flags[lid] & 0xff;
+
+   /* NPC_LAYER_KEX_S */
+   layer_info = ((flow_info->keyx_supp_nmask[intf] >> off) & 0x7);
+
+   if (layer_info) {
+   for (idx = 0; idx <= 2 ; idx++) {
+   if (layer_info & (1 << idx)) {
+   if (idx == 2)
+   data = lt;
+   else if (idx == 1)
+   data = ((flags >> 4) & 0xf);
+   else
+   data = (flags & 0xf);
+
+   if (data_off >= 64) {
+   data_off = 0;
+   index++;
+   }
+   key_data[index] |= ((uint64_t)data <<
+   data_off);
+   mask = 0xf;
+   if (lt == 0)
+   mask = 0;
+   key_mask[index] |= ((uint64_t)mask <<
+   data_off);
+   data_off += 4;
+   }
+   }
+   }
+   }
+
+   otx2_npc_dbg("Npc prog key data0: 0x%" PRIx64 ", data1: 0x%" PRIx64,
+key_data[0], key_data[1]);
+
+   /* Copy this into mcam string */
+   key_len = (pst->npc->keyx_len[intf] + 7) / 8;
+   otx2_npc_dbg("Key_len  = %d", key_len);
+   memcpy(pst->flow->mcam_data, key_data, key_len);
+   memcpy(pst->flow->mcam_mask, key_mask, key_len);
+
+   otx2_npc_dbg("Final flow data");
+   for (idx = 0; idx < OTX2_MAX_MCAM_WIDTH_DWORDS; idx++) {
+   otx2_npc_dbg("data[%d]: 0x%" PRIx64 ", mask[%d]: 0x%" PRIx64,
+idx, pst->flow->mcam_data[idx],
+idx, pst->flow->mcam_mask[idx]);
+   }
+
+   /*
+* Now we have mcam data and mask formatted as
+

[dpdk-dev] [PATCH v2 40/57] net/octeontx2: add flow destroy ops support

[jerinj]

From: Kiran Kumar K 

Adding few more flow operations like flow_destroy, flow_isolate
and flow_flush.

Signed-off-by: Kiran Kumar K 
Signed-off-by: Vivek Sharma 
---
 drivers/net/octeontx2/otx2_flow.c | 206 ++
 drivers/net/octeontx2/otx2_rx.h   |   3 +
 2 files changed, 209 insertions(+)

diff --git a/drivers/net/octeontx2/otx2_flow.c 
b/drivers/net/octeontx2/otx2_flow.c
index 896aef00a..24bde623d 100644
--- a/drivers/net/octeontx2/otx2_flow.c
+++ b/drivers/net/octeontx2/otx2_flow.c
@@ -5,6 +5,48 @@
 #include "otx2_ethdev.h"
 #include "otx2_flow.h"
 
+int
+otx2_flow_free_all_resources(struct otx2_eth_dev *hw)
+{
+   struct otx2_npc_flow_info *npc = &hw->npc_flow;
+   struct otx2_mbox *mbox = hw->mbox;
+   struct otx2_mcam_ents_info *info;
+   struct rte_bitmap *bmap;
+   struct rte_flow *flow;
+   int entry_count = 0;
+   int rc, idx;
+
+   for (idx = 0; idx < npc->flow_max_priority; idx++) {
+   info = &npc->flow_entry_info[idx];
+   entry_count += info->live_ent;
+   }
+
+   if (entry_count == 0)
+   return 0;
+
+   /* Free all MCAM entries allocated */
+   rc = otx2_flow_mcam_free_all_entries(mbox);
+
+   /* Free any MCAM counters and delete flow list */
+   for (idx = 0; idx < npc->flow_max_priority; idx++) {
+   while ((flow = TAILQ_FIRST(&npc->flow_list[idx])) != NULL) {
+   if (flow->ctr_id != NPC_COUNTER_NONE)
+   rc |= otx2_flow_mcam_free_counter(mbox,
+flow->ctr_id);
+
+   TAILQ_REMOVE(&npc->flow_list[idx], flow, next);
+   rte_free(flow);
+   bmap = npc->live_entries[flow->priority];
+   rte_bitmap_clear(bmap, flow->mcam_id);
+   }
+   info = &npc->flow_entry_info[idx];
+   info->free_ent = 0;
+   info->live_ent = 0;
+   }
+   return rc;
+}
+
+
 static int
 flow_program_npc(struct otx2_parse_state *pst, struct otx2_mbox *mbox,
 struct otx2_npc_flow_info *flow_info)
@@ -237,6 +279,27 @@ flow_program_rss_action(struct rte_eth_dev *eth_dev,
return 0;
 }
 
+static int
+flow_free_rss_action(struct rte_eth_dev *eth_dev,
+struct rte_flow *flow)
+{
+   struct otx2_eth_dev *dev = eth_dev->data->dev_private;
+   struct otx2_npc_flow_info *npc = &dev->npc_flow;
+   uint32_t rss_grp;
+
+   if (flow->npc_action & NIX_RX_ACTIONOP_RSS) {
+   rss_grp = (flow->npc_action >> NIX_RSS_ACT_GRP_OFFSET) &
+   NIX_RSS_ACT_GRP_MASK;
+   if (rss_grp == 0 || rss_grp >= npc->rss_grps)
+   return -EINVAL;
+
+   rte_bitmap_clear(npc->rss_grp_entries, rss_grp);
+   }
+
+   return 0;
+}
+
+
 static int
 flow_parse_meta_items(__rte_unused struct otx2_parse_state *pst)
 {
@@ -445,7 +508,150 @@ otx2_flow_create(struct rte_eth_dev *dev,
return NULL;
 }
 
+static int
+otx2_flow_destroy(struct rte_eth_dev *dev,
+ struct rte_flow *flow,
+ struct rte_flow_error *error)
+{
+   struct otx2_eth_dev *hw = dev->data->dev_private;
+   struct otx2_npc_flow_info *npc = &hw->npc_flow;
+   struct otx2_mbox *mbox = hw->mbox;
+   struct rte_bitmap *bmap;
+   uint16_t match_id;
+   int rc;
+
+   match_id = (flow->npc_action >> NIX_RX_ACT_MATCH_OFFSET) &
+   NIX_RX_ACT_MATCH_MASK;
+
+   if (match_id && match_id < OTX2_FLOW_ACTION_FLAG_DEFAULT) {
+   if (rte_atomic32_read(&npc->mark_actions) == 0)
+   return -EINVAL;
+
+   /* Clear mark offload flag if there are no more mark actions */
+   if (rte_atomic32_sub_return(&npc->mark_actions, 1) == 0)
+   hw->rx_offload_flags &= ~NIX_RX_OFFLOAD_MARK_UPDATE_F;
+   }
+
+   rc = flow_free_rss_action(dev, flow);
+   if (rc != 0) {
+   rte_flow_error_set(error, EIO,
+  RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+  NULL,
+  "Failed to free rss action");
+   }
+
+   rc = otx2_flow_mcam_free_entry(mbox, flow->mcam_id);
+   if (rc != 0) {
+   rte_flow_error_set(error, EIO,
+  RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+  NULL,
+  "Failed to destroy filter");
+   }
+
+   TAILQ_REMOVE(&npc->flow_list[flow->priority], flow, next);
+
+   bmap = npc->live_entries[flow->priority];
+   rte_bitmap_clear(bmap, flow->mcam_id);
+
+   rte_free(flow);
+   return 0;
+}
+
+static int
+otx2_flow_flush(struct rte_eth_dev *dev,
+   struct rte_flow_error *error)
+{
+   struct otx2_eth_dev *hw = dev->data->dev_p

[dpdk-dev] [PATCH v2 44/57] net/octeontx2: support VLAN offloads

[jerinj]

From: Vivek Sharma 

Support configuring VLAN offloads for an ethernet device and
dynamic promiscuous mode configuration for VLAN filters where
filters are updated according to promiscuous mode of the device.

Signed-off-by: Vivek Sharma 
---
 doc/guides/nics/features/octeontx2.ini |   2 +
 doc/guides/nics/features/octeontx2_vec.ini |   2 +
 doc/guides/nics/features/octeontx2_vf.ini  |   2 +
 doc/guides/nics/octeontx2.rst  |   1 +
 drivers/net/octeontx2/otx2_ethdev.c|   1 +
 drivers/net/octeontx2/otx2_ethdev.h|   3 +
 drivers/net/octeontx2/otx2_ethdev_ops.c|   1 +
 drivers/net/octeontx2/otx2_rx.h|   1 +
 drivers/net/octeontx2/otx2_vlan.c  | 523 -
 9 files changed, 527 insertions(+), 9 deletions(-)

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index 33d2f2785..ac4712b0c 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -23,6 +23,8 @@ RSS reta update  = Y
 Inner RSS= Y
 Flow control = Y
 Flow API = Y
+VLAN offload = Y
+QinQ offload = Y
 Packet type parsing  = Y
 Timesync = Y
 Timestamp offload= Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index 980a4daf9..e54c1babe 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -23,6 +23,8 @@ RSS reta update  = Y
 Inner RSS= Y
 Flow control = Y
 Flow API = Y
+VLAN offload = Y
+QinQ offload = Y
 Packet type parsing  = Y
 Rx descriptor status = Y
 Basic stats  = Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
index 330534a90..769ab16ee 100644
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -18,6 +18,8 @@ RSS key update   = Y
 RSS reta update  = Y
 Inner RSS= Y
 Flow API = Y
+VLAN offload = Y
+QinQ offload = Y
 Packet type parsing  = Y
 Rx descriptor status = Y
 Basic stats  = Y
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index 0f1756932..a53b71a6d 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -24,6 +24,7 @@ Features of the OCTEON TX2 Ethdev PMD are:
 - Receiver Side Scaling (RSS)
 - MAC filtering
 - Generic flow API
+- VLAN/QinQ stripping and insertion
 - Port hardware statistics
 - Link state information
 - Link flow control
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 48c2e8f57..55a5cdc48 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -1345,6 +1345,7 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.timesync_adjust_time = otx2_nix_timesync_adjust_time,
.timesync_read_time   = otx2_nix_timesync_read_time,
.timesync_write_time  = otx2_nix_timesync_write_time,
+   .vlan_offload_set = otx2_nix_vlan_offload_set,
 };
 
 static inline int
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 8577272b4..50fd18b6e 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -221,6 +221,7 @@ struct otx2_vlan_info {
uint8_t filter_on;
uint8_t strip_on;
uint8_t qinq_on;
+   uint8_t promisc_on;
 };
 
 struct otx2_eth_dev {
@@ -447,6 +448,8 @@ int otx2_nix_update_flow_ctrl_mode(struct rte_eth_dev 
*eth_dev);
 /* VLAN */
 int otx2_nix_vlan_offload_init(struct rte_eth_dev *eth_dev);
 int otx2_nix_vlan_fini(struct rte_eth_dev *eth_dev);
+int otx2_nix_vlan_offload_set(struct rte_eth_dev *eth_dev, int mask);
+void otx2_nix_vlan_update_promisc(struct rte_eth_dev *eth_dev, int enable);
 
 /* Lookup configuration */
 void *otx2_nix_fastpath_lookup_mem_get(void);
diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c 
b/drivers/net/octeontx2/otx2_ethdev_ops.c
index e55acd4e0..690d8ac0c 100644
--- a/drivers/net/octeontx2/otx2_ethdev_ops.c
+++ b/drivers/net/octeontx2/otx2_ethdev_ops.c
@@ -40,6 +40,7 @@ otx2_nix_promisc_config(struct rte_eth_dev *eth_dev, int en)
 
otx2_mbox_process(mbox);
eth_dev->data->promiscuous = en;
+   otx2_nix_vlan_update_promisc(eth_dev, en);
 }
 
 void
diff --git a/drivers/net/octeontx2/otx2_rx.h b/drivers/net/octeontx2/otx2_rx.h
index e18e04658..7dc34d705 100644
--- a/drivers/net/octeontx2/otx2_rx.h
+++ b/drivers/net/octeontx2/otx2_rx.h
@@ -16,6 +16,7 @@
 sizeof(uint16_t))
 
 #define NIX_RX_OFFLOAD_PTYPE_F BIT(1)
+#define NIX_RX_OFFLOAD_VLAN_STRIP_FBIT(3)
 #define NIX_RX_OFFLOAD_MARK_UPDATE_F   BIT(4)
 #define NIX_RX_OFFLOAD_TSTAMP_FBIT(5)
 
diff --git a/drivers/net/octeontx2/otx2_vlan.c 
b/drivers/net/octeontx

[dpdk-dev] [PATCH v2 43/57] net/octeontx2: implement VLAN utility functions

[jerinj]

From: Vivek Sharma 

Implement accessory functions needed for VLAN functionality.
Introduce VLAN related structures as well.

Signed-off-by: Vivek Sharma 
---
 drivers/net/octeontx2/Makefile  |   1 +
 drivers/net/octeontx2/meson.build   |   1 +
 drivers/net/octeontx2/otx2_ethdev.c |  10 ++
 drivers/net/octeontx2/otx2_ethdev.h |  46 +++
 drivers/net/octeontx2/otx2_vlan.c   | 190 
 5 files changed, 248 insertions(+)
 create mode 100644 drivers/net/octeontx2/otx2_vlan.c

diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index 21559f631..d22ddae33 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -34,6 +34,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
otx2_ptp.c  \
otx2_flow.c \
otx2_link.c \
+   otx2_vlan.c \
otx2_stats.c\
otx2_lookup.c   \
otx2_ethdev.c   \
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index f0e03bffe..6281ee21b 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -9,6 +9,7 @@ sources = files(
'otx2_ptp.c',
'otx2_flow.c',
'otx2_link.c',
+   'otx2_vlan.c',
'otx2_stats.c',
'otx2_lookup.c',
'otx2_ethdev.c',
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 09201fd23..48c2e8f57 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -1083,6 +1083,7 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
/* Free the resources allocated from the previous configure */
if (dev->configured == 1) {
otx2_nix_rxchan_bpid_cfg(eth_dev, false);
+   otx2_nix_vlan_fini(eth_dev);
oxt2_nix_unregister_queue_irqs(eth_dev);
nix_set_nop_rxtx_function(eth_dev);
rc = nix_store_queue_cfg_and_then_release(eth_dev);
@@ -1129,6 +1130,12 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
goto free_nix_lf;
}
 
+   rc = otx2_nix_vlan_offload_init(eth_dev);
+   if (rc) {
+   otx2_err("Failed to init vlan offload rc=%d", rc);
+   goto free_nix_lf;
+   }
+
/* Register queue IRQs */
rc = oxt2_nix_register_queue_irqs(eth_dev);
if (rc) {
@@ -1547,6 +1554,9 @@ otx2_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool 
mbox_close)
/* Disable nix bpid config */
otx2_nix_rxchan_bpid_cfg(eth_dev, false);
 
+   /* Disable vlan offloads */
+   otx2_nix_vlan_fini(eth_dev);
+
/* Disable other rte_flow entries */
otx2_flow_fini(dev);
 
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index ad12f2553..8577272b4 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -182,6 +182,47 @@ struct otx2_fc_info {
uint16_t bpid[NIX_MAX_CHAN];
 };
 
+struct vlan_mkex_info {
+   struct npc_xtract_info la_xtract;
+   struct npc_xtract_info lb_xtract;
+   uint64_t lb_lt_offset;
+};
+
+struct vlan_entry {
+   uint32_t mcam_idx;
+   uint16_t vlan_id;
+   TAILQ_ENTRY(vlan_entry) next;
+};
+
+TAILQ_HEAD(otx2_vlan_filter_tbl, vlan_entry);
+
+struct otx2_vlan_info {
+   struct otx2_vlan_filter_tbl fltr_tbl;
+   /* MKEX layer info */
+   struct mcam_entry def_tx_mcam_ent;
+   struct mcam_entry def_rx_mcam_ent;
+   struct vlan_mkex_info mkex;
+   /* Default mcam entry that matches vlan packets */
+   uint32_t def_rx_mcam_idx;
+   uint32_t def_tx_mcam_idx;
+   /* MCAM entry that matches double vlan packets */
+   uint32_t qinq_mcam_idx;
+   /* Indices of tx_vtag def registers */
+   uint32_t outer_vlan_idx;
+   uint32_t inner_vlan_idx;
+   uint16_t outer_vlan_tpid;
+   uint16_t inner_vlan_tpid;
+   uint16_t pvid;
+   /* QinQ entry allocated before default one */
+   uint8_t qinq_before_def;
+   uint8_t pvid_insert_on;
+   /* Rx vtag action type */
+   uint8_t vtag_type_idx;
+   uint8_t filter_on;
+   uint8_t strip_on;
+   uint8_t qinq_on;
+};
+
 struct otx2_eth_dev {
OTX2_DEV; /* Base class */
MARKER otx2_eth_dev_data_start;
@@ -233,6 +274,7 @@ struct otx2_eth_dev {
uint32_t txmap[RTE_ETHDEV_QUEUE_STAT_CNTRS];
uint32_t rxmap[RTE_ETHDEV_QUEUE_STAT_CNTRS];
struct otx2_npc_flow_info npc_flow;
+   struct otx2_vlan_info vlan_info;
struct otx2_eth_qconf *tx_qconf;
struct otx2_eth_qconf *rx_qconf;
struct rte_eth_dev *eth_dev;
@@ -402,6 +444,10 @@ int otx2_nix_rxchan_bpid_cfg(struct rte_eth_dev *eth_dev, 
bool enb);
 
 int otx2_nix_update_flow_ctrl_mode(struct rte_eth_dev *eth_dev);
 
+/* VLAN */
+int otx2_nix_vlan_offload_init(struct rte_eth_dev *eth_dev);
+int otx2_n

[dpdk-dev] [PATCH v2 42/57] net/octeontx2: connect flow API to ethdev ops

[jerinj]

From: Vivek Sharma 

Connect rte_flow driver ops to ethdev via .filter_ctrl op.

Signed-off-by: Vivek Sharma 
Signed-off-by: Kiran Kumar K 
---
 doc/guides/nics/features/octeontx2.ini |  1 +
 doc/guides/nics/features/octeontx2_vec.ini |  1 +
 doc/guides/nics/features/octeontx2_vf.ini  |  1 +
 doc/guides/nics/octeontx2.rst  | 93 ++
 drivers/net/octeontx2/otx2_ethdev.c|  9 +++
 drivers/net/octeontx2/otx2_ethdev.h|  3 +
 drivers/net/octeontx2/otx2_ethdev_ops.c| 21 +
 7 files changed, 129 insertions(+)

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index 46fb00be6..33d2f2785 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -22,6 +22,7 @@ RSS key update   = Y
 RSS reta update  = Y
 Inner RSS= Y
 Flow control = Y
+Flow API = Y
 Packet type parsing  = Y
 Timesync = Y
 Timestamp offload= Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index f3f812804..980a4daf9 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -22,6 +22,7 @@ RSS key update   = Y
 RSS reta update  = Y
 Inner RSS= Y
 Flow control = Y
+Flow API = Y
 Packet type parsing  = Y
 Rx descriptor status = Y
 Basic stats  = Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
index 7fba7e1d9..330534a90 100644
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -17,6 +17,7 @@ RSS hash = Y
 RSS key update   = Y
 RSS reta update  = Y
 Inner RSS= Y
+Flow API = Y
 Packet type parsing  = Y
 Rx descriptor status = Y
 Basic stats  = Y
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index 41eb3c7b9..0f1756932 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -23,6 +23,7 @@ Features of the OCTEON TX2 Ethdev PMD are:
 - Multiple queues for TX and RX
 - Receiver Side Scaling (RSS)
 - MAC filtering
+- Generic flow API
 - Port hardware statistics
 - Link state information
 - Link flow control
@@ -109,3 +110,95 @@ Runtime Config Options
Above devarg parameters are configurable per device, user needs to pass the
parameters to all the PCIe devices if application requires to configure on
all the ethdev ports.
+
+RTE Flow Support
+
+
+The OCTEON TX2 SoC family NIC has support for the following patterns and
+actions.
+
+Patterns:
+
+.. _table_octeontx2_supported_flow_item_types:
+
+.. table:: Item types
+
+   +++
+   | #  | Pattern Type   |
+   +++
+   | 1  | RTE_FLOW_ITEM_TYPE_ETH |
+   +++
+   | 2  | RTE_FLOW_ITEM_TYPE_VLAN|
+   +++
+   | 3  | RTE_FLOW_ITEM_TYPE_E_TAG   |
+   +++
+   | 4  | RTE_FLOW_ITEM_TYPE_IPV4|
+   +++
+   | 5  | RTE_FLOW_ITEM_TYPE_IPV6|
+   +++
+   | 6  | RTE_FLOW_ITEM_TYPE_ARP_ETH_IPV4|
+   +++
+   | 7  | RTE_FLOW_ITEM_TYPE_MPLS|
+   +++
+   | 8  | RTE_FLOW_ITEM_TYPE_ICMP|
+   +++
+   | 9  | RTE_FLOW_ITEM_TYPE_UDP |
+   +++
+   | 10 | RTE_FLOW_ITEM_TYPE_TCP |
+   +++
+   | 11 | RTE_FLOW_ITEM_TYPE_SCTP|
+   +++
+   | 12 | RTE_FLOW_ITEM_TYPE_ESP |
+   +++
+   | 13 | RTE_FLOW_ITEM_TYPE_GRE |
+   +++
+   | 14 | RTE_FLOW_ITEM_TYPE_NVGRE   |
+   +++
+   | 15 | RTE_FLOW_ITEM_TYPE_VXLAN   |
+   +++
+   | 16 | RTE_FLOW_ITEM_TYPE_GTPC|
+   +++
+   | 17 | RTE_FLOW_ITEM_TYPE_GTPU|
+   +++
+   | 18 | RTE_FLOW_ITEM_TYPE_VOID|
+   +++
+   | 19 | RTE_FLOW_ITEM_TYPE_ANY |
+   +++
+
+Actions:
+
+.. _table_octeontx2_supported_ingress_action_types:
+
+.. table:: Ingress action types
+
+   +++
+   | #  | Action Type|
+   +++
+   | 1  | RTE_FLOW_ACTION_TYPE_VOID  |
+   +++
+   | 2  | RTE_FLOW_ACTION_TYPE_MARK  |
+   +++

[dpdk-dev] [PATCH v2 41/57] net/octeontx2: add flow init and fini

[jerinj]

From: Kiran Kumar K 

Adding the flow init and fini functionality. These will be called from
dev init and will initialize and de-initialize the flow related memory.

Signed-off-by: Kiran Kumar K 
Signed-off-by: Vivek Sharma 
---
 drivers/net/octeontx2/otx2_flow.c | 315 ++
 1 file changed, 315 insertions(+)

diff --git a/drivers/net/octeontx2/otx2_flow.c 
b/drivers/net/octeontx2/otx2_flow.c
index 24bde623d..94bd85161 100644
--- a/drivers/net/octeontx2/otx2_flow.c
+++ b/drivers/net/octeontx2/otx2_flow.c
@@ -655,3 +655,318 @@ const struct rte_flow_ops otx2_flow_ops = {
.query = otx2_flow_query,
.isolate = otx2_flow_isolate,
 };
+
+static int
+flow_supp_key_len(uint32_t supp_mask)
+{
+   int nib_count = 0;
+   while (supp_mask) {
+   nib_count++;
+   supp_mask &= (supp_mask - 1);
+   }
+   return nib_count * 4;
+}
+
+/* Refer HRM register:
+ * NPC_AF_INTF(0..1)_LID(0..7)_LT(0..15)_LD(0..1)_CFG
+ * and
+ * NPC_AF_INTF(0..1)_LDATA(0..1)_FLAGS(0..15)_CFG
+ **/
+#define BYTESM1_SHIFT  16
+#define HDR_OFF_SHIFT  8
+static void
+flow_update_kex_info(struct npc_xtract_info *xtract_info,
+uint64_t val)
+{
+   xtract_info->len = ((val >> BYTESM1_SHIFT) & 0xf) + 1;
+   xtract_info->hdr_off = (val >> HDR_OFF_SHIFT) & 0xff;
+   xtract_info->key_off = val & 0x3f;
+   xtract_info->enable = ((val >> 7) & 0x1);
+}
+
+static void
+flow_process_mkex_cfg(struct otx2_npc_flow_info *npc,
+ struct npc_get_kex_cfg_rsp *kex_rsp)
+{
+   volatile uint64_t (*q)[NPC_MAX_INTF][NPC_MAX_LID][NPC_MAX_LT]
+   [NPC_MAX_LD];
+   struct npc_xtract_info *x_info = NULL;
+   int lid, lt, ld, fl, ix;
+   otx2_dxcfg_t *p;
+   uint64_t keyw;
+   uint64_t val;
+
+   npc->keyx_supp_nmask[NPC_MCAM_RX] =
+   kex_rsp->rx_keyx_cfg & 0x7fffULL;
+   npc->keyx_supp_nmask[NPC_MCAM_TX] =
+   kex_rsp->tx_keyx_cfg & 0x7fffULL;
+   npc->keyx_len[NPC_MCAM_RX] =
+   flow_supp_key_len(npc->keyx_supp_nmask[NPC_MCAM_RX]);
+   npc->keyx_len[NPC_MCAM_TX] =
+   flow_supp_key_len(npc->keyx_supp_nmask[NPC_MCAM_TX]);
+
+   keyw = (kex_rsp->rx_keyx_cfg >> 32) & 0x7ULL;
+   npc->keyw[NPC_MCAM_RX] = keyw;
+   keyw = (kex_rsp->tx_keyx_cfg >> 32) & 0x7ULL;
+   npc->keyw[NPC_MCAM_TX] = keyw;
+
+   /* Update KEX_LD_FLAG */
+   for (ix = 0; ix < NPC_MAX_INTF; ix++) {
+   for (ld = 0; ld < NPC_MAX_LD; ld++) {
+   for (fl = 0; fl < NPC_MAX_LFL; fl++) {
+   x_info =
+   &npc->prx_fxcfg[ix][ld][fl].xtract[0];
+   val = kex_rsp->intf_ld_flags[ix][ld][fl];
+   flow_update_kex_info(x_info, val);
+   }
+   }
+   }
+
+   /* Update LID, LT and LDATA cfg */
+   p = &npc->prx_dxcfg;
+   q = (volatile uint64_t (*)[][NPC_MAX_LID][NPC_MAX_LT][NPC_MAX_LD])
+   (&kex_rsp->intf_lid_lt_ld);
+   for (ix = 0; ix < NPC_MAX_INTF; ix++) {
+   for (lid = 0; lid < NPC_MAX_LID; lid++) {
+   for (lt = 0; lt < NPC_MAX_LT; lt++) {
+   for (ld = 0; ld < NPC_MAX_LD; ld++) {
+   x_info = &(*p)[ix][lid][lt].xtract[ld];
+   val = (*q)[ix][lid][lt][ld];
+   flow_update_kex_info(x_info, val);
+   }
+   }
+   }
+   }
+   /* Update LDATA Flags cfg */
+   npc->prx_lfcfg[0].i = kex_rsp->kex_ld_flags[0];
+   npc->prx_lfcfg[1].i = kex_rsp->kex_ld_flags[1];
+}
+
+static struct otx2_idev_kex_cfg *
+flow_intra_dev_kex_cfg(void)
+{
+   static const char name[] = "octeontx2_intra_device_kex_conf";
+   struct otx2_idev_kex_cfg *idev;
+   const struct rte_memzone *mz;
+
+   mz = rte_memzone_lookup(name);
+   if (mz)
+   return mz->addr;
+
+   /* Request for the first time */
+   mz = rte_memzone_reserve_aligned(name, sizeof(struct otx2_idev_kex_cfg),
+SOCKET_ID_ANY, 0, OTX2_ALIGN);
+   if (mz) {
+   idev = mz->addr;
+   rte_atomic16_set(&idev->kex_refcnt, 0);
+   return idev;
+   }
+   return NULL;
+}
+
+static int
+flow_fetch_kex_cfg(struct otx2_eth_dev *dev)
+{
+   struct otx2_npc_flow_info *npc = &dev->npc_flow;
+   struct npc_get_kex_cfg_rsp *kex_rsp;
+   struct otx2_mbox *mbox = dev->mbox;
+   struct otx2_idev_kex_cfg *idev;
+   int rc = 0;
+
+   idev = flow_intra_dev_kex_cfg();
+   if (!idev)
+   return -ENOMEM;
+
+   /* Is kex_cfg read by any another driver? */
+   if (rte_atomic16_add_return(&idev->kex_refcnt, 1) == 1) {
+

[dpdk-dev] [PATCH v2 47/57] net/octeontx2: add FW version get operation

[jerinj]

From: Vamsi Attunuru 

Add firmware version get operation.

Signed-off-by: Vamsi Attunuru 
---
 doc/guides/nics/features/octeontx2.ini |  1 +
 doc/guides/nics/features/octeontx2_vec.ini |  1 +
 doc/guides/nics/features/octeontx2_vf.ini  |  1 +
 drivers/net/octeontx2/otx2_ethdev.c|  1 +
 drivers/net/octeontx2/otx2_ethdev.h|  3 +++
 drivers/net/octeontx2/otx2_ethdev_ops.c| 19 +++
 drivers/net/octeontx2/otx2_flow.c  |  7 +++
 7 files changed, 33 insertions(+)

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index 37b802999..211ff93e7 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -33,6 +33,7 @@ Rx descriptor status = Y
 Basic stats  = Y
 Stats per queue  = Y
 Extended stats   = Y
+FW version   = Y
 Module EEPROM dump   = Y
 Registers dump   = Y
 Linux VFIO   = Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index ccedd1359..967a3757d 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -31,6 +31,7 @@ Rx descriptor status = Y
 Basic stats  = Y
 Extended stats   = Y
 Stats per queue  = Y
+FW version   = Y
 Module EEPROM dump   = Y
 Registers dump   = Y
 Linux VFIO   = Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
index 24df14717..884167c88 100644
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -26,6 +26,7 @@ Rx descriptor status = Y
 Basic stats  = Y
 Extended stats   = Y
 Stats per queue  = Y
+FW version   = Y
 Module EEPROM dump   = Y
 Registers dump   = Y
 Linux VFIO   = Y
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index ad305dcd8..15f46a9bf 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -1336,6 +1336,7 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.filter_ctrl  = otx2_nix_dev_filter_ctrl,
.get_module_info  = otx2_nix_get_module_info,
.get_module_eeprom= otx2_nix_get_module_eeprom,
+   .fw_version_get   = otx2_nix_fw_version_get,
.flow_ctrl_get= otx2_nix_flow_ctrl_get,
.flow_ctrl_set= otx2_nix_flow_ctrl_set,
.timesync_enable  = otx2_nix_timesync_enable,
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 12db92257..e18483969 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -235,6 +235,7 @@ struct otx2_eth_dev {
uint8_t lso_tsov4_idx;
uint8_t lso_tsov6_idx;
uint8_t mac_addr[RTE_ETHER_ADDR_LEN];
+   uint8_t mkex_pfl_name[MKEX_NAME_LEN];
uint8_t max_mac_entries;
uint8_t lf_tx_stats;
uint8_t lf_rx_stats;
@@ -340,6 +341,8 @@ void otx2_nix_info_get(struct rte_eth_dev *eth_dev,
 int otx2_nix_dev_filter_ctrl(struct rte_eth_dev *eth_dev,
 enum rte_filter_type filter_type,
 enum rte_filter_op filter_op, void *arg);
+int otx2_nix_fw_version_get(struct rte_eth_dev *eth_dev, char *fw_version,
+   size_t fw_size);
 int otx2_nix_get_module_info(struct rte_eth_dev *eth_dev,
 struct rte_eth_dev_module_info *modinfo);
 int otx2_nix_get_module_eeprom(struct rte_eth_dev *eth_dev,
diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c 
b/drivers/net/octeontx2/otx2_ethdev_ops.c
index 690d8ac0c..6a3048336 100644
--- a/drivers/net/octeontx2/otx2_ethdev_ops.c
+++ b/drivers/net/octeontx2/otx2_ethdev_ops.c
@@ -210,6 +210,25 @@ otx2_nix_tx_done_cleanup(void *txq, uint32_t free_cnt)
return 0;
 }
 
+int
+otx2_nix_fw_version_get(struct rte_eth_dev *eth_dev, char *fw_version,
+   size_t fw_size)
+{
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+   int rc = (int)fw_size;
+
+   if (fw_size > sizeof(dev->mkex_pfl_name))
+   rc = sizeof(dev->mkex_pfl_name);
+
+   rc = strlcpy(fw_version, (char *)dev->mkex_pfl_name, rc);
+
+   rc += 1; /* Add the size of '\0' */
+   if (fw_size < (uint32_t)rc)
+   return rc;
+
+   return 0;
+}
+
 int
 otx2_nix_pool_ops_supported(struct rte_eth_dev *eth_dev, const char *pool)
 {
diff --git a/drivers/net/octeontx2/otx2_flow.c 
b/drivers/net/octeontx2/otx2_flow.c
index 94bd85161..3ddecfb23 100644
--- a/drivers/net/octeontx2/otx2_flow.c
+++ b/drivers/net/octeontx2/otx2_flow.c
@@ -770,6 +770,7 @@ flow_fetch_kex_cfg(struct otx2_eth_dev *dev)
struct otx2_npc_flow_info *npc = &dev->npc_flow;
struct npc_get_kex_cfg_rsp *kex_rsp;
struct otx2_mbox *mbox = dev->mbox;
+   char mk

[dpdk-dev] [PATCH v2 32/57] net/octeontx2: introducing flow driver

[jerinj]

From: Kiran Kumar K 

Introducing flow infra for octeontx2.
This will be used to maintain rte_flow rules.

Create, destroy, validate, query, flush, isolate flow operations
will be supported.

Signed-off-by: Kiran Kumar K 
Signed-off-by: Vivek Sharma 
---
 drivers/net/octeontx2/otx2_flow.h | 388 ++
 1 file changed, 388 insertions(+)
 create mode 100644 drivers/net/octeontx2/otx2_flow.h

diff --git a/drivers/net/octeontx2/otx2_flow.h 
b/drivers/net/octeontx2/otx2_flow.h
new file mode 100644
index 0..95bb6c2bf
--- /dev/null
+++ b/drivers/net/octeontx2/otx2_flow.h
@@ -0,0 +1,388 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2019 Marvell International Ltd.
+ */
+
+#ifndef __OTX2_FLOW_H__
+#define __OTX2_FLOW_H__
+
+#include 
+
+#include 
+#include 
+#include 
+
+#include "otx2_common.h"
+#include "otx2_ethdev.h"
+#include "otx2_mbox.h"
+
+int otx2_flow_init(struct otx2_eth_dev *hw);
+int otx2_flow_fini(struct otx2_eth_dev *hw);
+extern const struct rte_flow_ops otx2_flow_ops;
+
+enum {
+   OTX2_INTF_RX = 0,
+   OTX2_INTF_TX = 1,
+   OTX2_INTF_MAX = 2,
+};
+
+#define NPC_IH_LENGTH  8
+#define NPC_TPID_LENGTH2
+#define NPC_COUNTER_NONE   (-1)
+/* 32 bytes from LDATA_CFG & 32 bytes from FLAGS_CFG */
+#define NPC_MAX_EXTRACT_DATA_LEN   (64)
+#define NPC_LDATA_LFLAG_LEN(16)
+#define NPC_MCAM_TOT_ENTRIES   (4096)
+#define NPC_MAX_KEY_NIBBLES(31)
+/* Nibble offsets */
+#define NPC_LAYER_KEYX_SZ  (3)
+#define NPC_PARSE_KEX_S_LA_OFFSET  (7)
+#define NPC_PARSE_KEX_S_LID_OFFSET(lid)\
+   lid) - NPC_LID_LA) * NPC_LAYER_KEYX_SZ)  \
+   + NPC_PARSE_KEX_S_LA_OFFSET)
+
+
+/* supported flow actions flags */
+#define OTX2_FLOW_ACT_MARK(1 << 0)
+#define OTX2_FLOW_ACT_FLAG(1 << 1)
+#define OTX2_FLOW_ACT_DROP(1 << 2)
+#define OTX2_FLOW_ACT_QUEUE   (1 << 3)
+#define OTX2_FLOW_ACT_RSS (1 << 4)
+#define OTX2_FLOW_ACT_DUP (1 << 5)
+#define OTX2_FLOW_ACT_SEC (1 << 6)
+#define OTX2_FLOW_ACT_COUNT   (1 << 7)
+
+/* terminating actions */
+#define OTX2_FLOW_ACT_TERM(OTX2_FLOW_ACT_DROP  | \
+  OTX2_FLOW_ACT_QUEUE | \
+  OTX2_FLOW_ACT_RSS   | \
+  OTX2_FLOW_ACT_DUP   | \
+  OTX2_FLOW_ACT_SEC)
+
+/* This mark value indicates flag action */
+#define OTX2_FLOW_FLAG_VAL(0x)
+
+#define NIX_RX_ACT_MATCH_OFFSET(40)
+#define NIX_RX_ACT_MATCH_MASK  (0x)
+
+#define NIX_RSS_ACT_GRP_OFFSET (20)
+#define NIX_RSS_ACT_ALG_OFFSET (56)
+#define NIX_RSS_ACT_GRP_MASK   (0xF)
+#define NIX_RSS_ACT_ALG_MASK   (0x1F)
+
+/* PMD-specific definition of the opaque struct rte_flow */
+#define OTX2_MAX_MCAM_WIDTH_DWORDS 7
+
+enum npc_mcam_intf {
+   NPC_MCAM_RX,
+   NPC_MCAM_TX
+};
+
+struct npc_xtract_info {
+   /* Length in bytes of pkt data extracted. len = 0
+* indicates that extraction is disabled.
+*/
+   uint8_t len;
+   uint8_t hdr_off; /* Byte offset of proto hdr: extract_src */
+   uint8_t key_off; /* Byte offset in MCAM key where data is placed */
+   uint8_t enable; /* Extraction enabled or disabled */
+};
+
+/* Information for a given {LAYER, LTYPE} */
+struct npc_lid_lt_xtract_info {
+   /* Info derived from parser configuration */
+   uint16_t npc_proto;  /* Network protocol identified */
+   uint8_t  valid_flags_mask;   /* Flags applicable */
+   uint8_t  is_terminating:1;   /* No more parsing */
+   struct npc_xtract_info xtract[NPC_MAX_LD];
+};
+
+union npc_kex_ldata_flags_cfg {
+   struct {
+   #if defined(__BIG_ENDIAN_BITFIELD)
+   uint64_t rvsd_62_1  : 61;
+   uint64_t lid: 3;
+   #else
+   uint64_t lid: 3;
+   uint64_t rvsd_62_1  : 61;
+   #endif
+   } s;
+
+   uint64_t i;
+};
+
+typedef struct npc_lid_lt_xtract_info
+   otx2_dxcfg_t[NPC_MAX_INTF][NPC_MAX_LID][NPC_MAX_LT];
+typedef struct npc_lid_lt_xtract_info
+   otx2_fxcfg_t[NPC_MAX_INTF][NPC_MAX_LD][NPC_MAX_LFL];
+typedef union npc_kex_ldata_flags_cfg otx2_ld_flags_t[NPC_MAX_LD];
+
+
+/* MBOX_MSG_NPC_GET_DATAX_CFG Response */
+struct npc_get_datax_cfg {
+   /* NPC_AF_KEX_LDATA(0..1)_FLAGS_CFG */
+   union npc_kex_ldata_flags_cfg ld_flags[NPC_MAX_LD];
+   /* Extract information indexed with [LID][LTYPE] */
+   struct npc_lid_lt_xtract_info lid_lt_xtract[NPC_MAX_LID][NPC_MAX_LT];
+   /* Flags based extract indexed with [LDATA][FLAGS_LOWER_NIBBLE]
+* Fields flags_ena_ld0, flags_ena_ld1 in
+* struct npc_lid_lt_xtract_info indicate if this is applicable
+* for a given {LAYER, LTYPE}
+*/
+   struct npc_xtract_info flag_xtract[NPC_MAX_LD][NPC_MAX_LT];

[dpdk-dev] [PATCH v2 31/57] net/octeontx2: add remaining PTP operations

[jerinj]

From: Harman Kalra 

Add remaining PTP configuration/slowpath operations.
Timesync feature is available only for PF devices.

Signed-off-by: Harman Kalra 
Signed-off-by: Zyta Szpak 
---
 doc/guides/nics/features/octeontx2.ini |   2 +
 drivers/net/octeontx2/otx2_ethdev.c|   6 ++
 drivers/net/octeontx2/otx2_ethdev.h|  11 +++
 drivers/net/octeontx2/otx2_ptp.c   | 130 +
 4 files changed, 149 insertions(+)

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index 00feb0cf2..46fb00be6 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -23,6 +23,8 @@ RSS reta update  = Y
 Inner RSS= Y
 Flow control = Y
 Packet type parsing  = Y
+Timesync = Y
+Timestamp offload= Y
 Rx descriptor status = Y
 Basic stats  = Y
 Stats per queue  = Y
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 29e8130f4..7512aacb3 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -47,6 +47,7 @@ nix_get_tx_offload_capa(struct otx2_eth_dev *dev)
 
 static const struct otx2_dev_ops otx2_dev_ops = {
.link_status_update = otx2_eth_dev_link_status_update,
+   .ptp_info_update = otx2_eth_dev_ptp_info_update
 };
 
 static int
@@ -1331,6 +1332,11 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.flow_ctrl_set= otx2_nix_flow_ctrl_set,
.timesync_enable  = otx2_nix_timesync_enable,
.timesync_disable = otx2_nix_timesync_disable,
+   .timesync_read_rx_timestamp = otx2_nix_timesync_read_rx_timestamp,
+   .timesync_read_tx_timestamp = otx2_nix_timesync_read_tx_timestamp,
+   .timesync_adjust_time = otx2_nix_timesync_adjust_time,
+   .timesync_read_time   = otx2_nix_timesync_read_time,
+   .timesync_write_time  = otx2_nix_timesync_write_time,
 };
 
 static inline int
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 1ca28add4..8f8d93a39 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -430,5 +430,16 @@ void otx2_nix_form_default_desc(struct otx2_eth_txq *txq);
 /* Timesync - PTP routines */
 int otx2_nix_timesync_enable(struct rte_eth_dev *eth_dev);
 int otx2_nix_timesync_disable(struct rte_eth_dev *eth_dev);
+int otx2_nix_timesync_read_rx_timestamp(struct rte_eth_dev *eth_dev,
+   struct timespec *timestamp,
+   uint32_t flags);
+int otx2_nix_timesync_read_tx_timestamp(struct rte_eth_dev *eth_dev,
+   struct timespec *timestamp);
+int otx2_nix_timesync_adjust_time(struct rte_eth_dev *eth_dev, int64_t delta);
+int otx2_nix_timesync_write_time(struct rte_eth_dev *eth_dev,
+const struct timespec *ts);
+int otx2_nix_timesync_read_time(struct rte_eth_dev *eth_dev,
+   struct timespec *ts);
+int otx2_eth_dev_ptp_info_update(struct otx2_dev *dev, bool ptp_en);
 
 #endif /* __OTX2_ETHDEV_H__ */
diff --git a/drivers/net/octeontx2/otx2_ptp.c b/drivers/net/octeontx2/otx2_ptp.c
index 105067949..5291da241 100644
--- a/drivers/net/octeontx2/otx2_ptp.c
+++ b/drivers/net/octeontx2/otx2_ptp.c
@@ -57,6 +57,23 @@ nix_ptp_config(struct rte_eth_dev *eth_dev, int en)
return otx2_mbox_process(mbox);
 }
 
+int
+otx2_eth_dev_ptp_info_update(struct otx2_dev *dev, bool ptp_en)
+{
+   struct otx2_eth_dev *otx2_dev = (struct otx2_eth_dev *)dev;
+   struct rte_eth_dev *eth_dev = otx2_dev->eth_dev;
+   int i;
+
+   otx2_dev->ptp_en = ptp_en;
+   for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
+   struct otx2_eth_rxq *rxq = eth_dev->data->rx_queues[i];
+   rxq->mbuf_initializer =
+   otx2_nix_rxq_mbuf_setup(otx2_dev,
+   eth_dev->data->port_id);
+   }
+   return 0;
+}
+
 int
 otx2_nix_timesync_enable(struct rte_eth_dev *eth_dev)
 {
@@ -133,3 +150,116 @@ otx2_nix_timesync_disable(struct rte_eth_dev *eth_dev)
}
return rc;
 }
+
+int
+otx2_nix_timesync_read_rx_timestamp(struct rte_eth_dev *eth_dev,
+   struct timespec *timestamp,
+   uint32_t __rte_unused flags)
+{
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+   struct otx2_timesync_info *tstamp = &dev->tstamp;
+   uint64_t ns;
+
+   if (!tstamp->rx_ready)
+   return -EINVAL;
+
+   ns = rte_timecounter_update(&dev->rx_tstamp_tc, tstamp->rx_tstamp);
+   *timestamp = rte_ns_to_timespec(ns);
+   tstamp->rx_ready = 0;
+
+   otx2_nix_dbg("rx timestamp: %llu sec: %lu nsec %lu",
+(unsigned long long)tstamp->rx_tstamp, timestamp->tv_sec,
+   

[dpdk-dev] [PATCH v2 46/57] net/octeontx2: support VLAN TPID and PVID for Tx

[jerinj]

From: Vivek Sharma 

Implement support for setting VLAN TPID and PVID for Tx packets.

Signed-off-by: Vivek Sharma 
---
 drivers/net/octeontx2/otx2_ethdev.c |   2 +
 drivers/net/octeontx2/otx2_ethdev.h |   5 +-
 drivers/net/octeontx2/otx2_vlan.c   | 193 
 3 files changed, 199 insertions(+), 1 deletion(-)

diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 78cbd8811..ad305dcd8 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -1348,6 +1348,8 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.vlan_offload_set = otx2_nix_vlan_offload_set,
.vlan_filter_set  = otx2_nix_vlan_filter_set,
.vlan_strip_queue_set = otx2_nix_vlan_strip_queue_set,
+   .vlan_tpid_set= otx2_nix_vlan_tpid_set,
+   .vlan_pvid_set= otx2_nix_vlan_pvid_set,
 };
 
 static inline int
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 996ddec47..12db92257 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -453,7 +453,10 @@ void otx2_nix_vlan_update_promisc(struct rte_eth_dev 
*eth_dev, int enable);
 int otx2_nix_vlan_filter_set(struct rte_eth_dev *eth_dev, uint16_t vlan_id,
 int on);
 void otx2_nix_vlan_strip_queue_set(struct rte_eth_dev *dev,
-   uint16_t queue, int on);
+  uint16_t queue, int on);
+int otx2_nix_vlan_tpid_set(struct rte_eth_dev *eth_dev,
+  enum rte_vlan_type type, uint16_t tpid);
+int otx2_nix_vlan_pvid_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on);
 
 /* Lookup configuration */
 void *otx2_nix_fastpath_lookup_mem_get(void);
diff --git a/drivers/net/octeontx2/otx2_vlan.c 
b/drivers/net/octeontx2/otx2_vlan.c
index 6216d6545..dc0f4e032 100644
--- a/drivers/net/octeontx2/otx2_vlan.c
+++ b/drivers/net/octeontx2/otx2_vlan.c
@@ -82,6 +82,39 @@ nix_set_rx_vlan_action(struct rte_eth_dev *eth_dev,
entry->vtag_action = vtag_action;
 }
 
+static void
+nix_set_tx_vlan_action(struct mcam_entry *entry, enum rte_vlan_type type,
+  int vtag_index)
+{
+   union {
+   uint64_t reg;
+   struct nix_tx_vtag_action_s act;
+   } vtag_action;
+
+   uint64_t action;
+
+   action = NIX_TX_ACTIONOP_UCAST_DEFAULT;
+
+   /*
+* Take offset from LA since in case of untagged packet,
+* lbptr is zero.
+*/
+   if (type == ETH_VLAN_TYPE_OUTER) {
+   vtag_action.act.vtag0_def = vtag_index;
+   vtag_action.act.vtag0_lid = NPC_LID_LA;
+   vtag_action.act.vtag0_op = NIX_TX_VTAGOP_INSERT;
+   vtag_action.act.vtag0_relptr = NIX_TX_VTAGACTION_VTAG0_RELPTR;
+   } else {
+   vtag_action.act.vtag1_def = vtag_index;
+   vtag_action.act.vtag1_lid = NPC_LID_LA;
+   vtag_action.act.vtag1_op = NIX_TX_VTAGOP_INSERT;
+   vtag_action.act.vtag1_relptr = NIX_TX_VTAGACTION_VTAG1_RELPTR;
+   }
+
+   entry->action = action;
+   entry->vtag_action = vtag_action.reg;
+}
+
 static int
 nix_vlan_mcam_free(struct otx2_eth_dev *dev, uint32_t entry)
 {
@@ -416,6 +449,46 @@ nix_vlan_handle_default_rx_entry(struct rte_eth_dev 
*eth_dev, bool strip,
return 0;
 }
 
+/* Installs/Removes default tx entry */
+static int
+nix_vlan_handle_default_tx_entry(struct rte_eth_dev *eth_dev,
+enum rte_vlan_type type, int vtag_index,
+int enable)
+{
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+   struct otx2_vlan_info *vlan = &dev->vlan_info;
+   struct mcam_entry entry;
+   uint16_t pf_func;
+   int rc;
+
+   if (!vlan->def_tx_mcam_idx && enable) {
+   memset(&entry, 0, sizeof(struct mcam_entry));
+
+   /* Only pf_func is matched, swap it's bytes */
+   pf_func = (dev->pf_func & 0xff) << 8;
+   pf_func |= (dev->pf_func >> 8) & 0xff;
+
+   /* PF Func extracted to KW1[63:48] */
+   entry.kw[1] = (uint64_t)pf_func << 48;
+   entry.kw_mask[1] = (BIT_ULL(16) - 1) << 48;
+
+   nix_set_tx_vlan_action(&entry, type, vtag_index);
+   vlan->def_tx_mcam_ent = entry;
+
+   return nix_vlan_mcam_alloc_and_write(eth_dev, &entry,
+NIX_INTF_TX, 0);
+   }
+
+   if (vlan->def_tx_mcam_idx && !enable) {
+   rc = nix_vlan_mcam_free(dev, vlan->def_tx_mcam_idx);
+   if (rc)
+   return rc;
+   vlan->def_rx_mcam_idx = 0;
+   }
+
+   return 0;
+}
+
 /* Configure vlan stripping on or off */
 static int
 nix_vlan_hw_strip(struct rte_eth_dev *eth_dev, const uint8_t enable)
@@ -693,

[dpdk-dev] [PATCH v2 30/57] net/octeontx2: add PTP base support

[jerinj]

From: Harman Kalra 

Add PTP enable and disable operations.

Signed-off-by: Harman Kalra 
Signed-off-by: Zyta Szpak 
---
 doc/guides/nics/octeontx2.rst   |   1 +
 drivers/net/octeontx2/Makefile  |   1 +
 drivers/net/octeontx2/meson.build   |   1 +
 drivers/net/octeontx2/otx2_ethdev.c |  22 -
 drivers/net/octeontx2/otx2_ethdev.h |  17 
 drivers/net/octeontx2/otx2_ptp.c| 135 
 drivers/net/octeontx2/otx2_rx.h |  11 +++
 7 files changed, 185 insertions(+), 3 deletions(-)
 create mode 100644 drivers/net/octeontx2/otx2_ptp.c

diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index 20281b030..41eb3c7b9 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -27,6 +27,7 @@ Features of the OCTEON TX2 Ethdev PMD are:
 - Link state information
 - Link flow control
 - Debug utilities - Context dump and error interrupt support
+- IEEE1588 timestamping
 
 Prerequisites
 -
diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index 4a361846f..a0155e727 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -31,6 +31,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
otx2_tm.c   \
otx2_rss.c  \
otx2_mac.c  \
+   otx2_ptp.c  \
otx2_link.c \
otx2_stats.c\
otx2_lookup.c   \
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index 4b56f4461..2cac57d2b 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -6,6 +6,7 @@ sources = files(
'otx2_tm.c',
'otx2_rss.c',
'otx2_mac.c',
+   'otx2_ptp.c',
'otx2_link.c',
'otx2_stats.c',
'otx2_lookup.c',
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 19b502903..29e8130f4 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -336,9 +336,7 @@ nix_cq_rq_uninit(struct rte_eth_dev *eth_dev, struct 
otx2_eth_rxq *rxq)
 static inline int
 nix_get_data_off(struct otx2_eth_dev *dev)
 {
-   RTE_SET_USED(dev);
-
-   return 0;
+   return otx2_ethdev_is_ptp_en(dev) ? NIX_TIMESYNC_RX_OFFSET : 0;
 }
 
 uint64_t
@@ -450,6 +448,7 @@ otx2_nix_rx_queue_setup(struct rte_eth_dev *eth_dev, 
uint16_t rq,
rxq->qlen = nix_qsize_to_val(qsize);
rxq->qsize = qsize;
rxq->lookup_mem = otx2_nix_fastpath_lookup_mem_get();
+   rxq->tstamp = &dev->tstamp;
 
/* Alloc completion queue */
rc = nix_cq_rq_init(eth_dev, dev, rq, rxq, mp);
@@ -717,6 +716,7 @@ otx2_nix_form_default_desc(struct otx2_eth_txq *txq)
send_mem->dsz = 0x0;
send_mem->wmem = 0x1;
send_mem->alg = NIX_SENDMEMALG_SETTSTMP;
+   send_mem->addr = txq->dev->tstamp.tx_tstamp_iova;
}
sg = (union nix_send_sg_s *)&txq->cmd[4];
} else {
@@ -1141,6 +1141,16 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
goto free_nix_lf;
}
 
+   /* Enable PTP if it was requested by the app or if it is already
+* enabled in PF owning this VF
+*/
+   memset(&dev->tstamp, 0, sizeof(struct otx2_timesync_info));
+   if ((dev->rx_offloads & DEV_RX_OFFLOAD_TIMESTAMP) ||
+   otx2_ethdev_is_ptp_en(dev))
+   otx2_nix_timesync_enable(eth_dev);
+   else
+   otx2_nix_timesync_disable(eth_dev);
+
/*
 * Restore queue config when reconfigure followed by
 * reconfigure and no queue configure invoked from application case.
@@ -1319,6 +1329,8 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.get_module_eeprom= otx2_nix_get_module_eeprom,
.flow_ctrl_get= otx2_nix_flow_ctrl_get,
.flow_ctrl_set= otx2_nix_flow_ctrl_set,
+   .timesync_enable  = otx2_nix_timesync_enable,
+   .timesync_disable = otx2_nix_timesync_disable,
 };
 
 static inline int
@@ -1523,6 +1535,10 @@ otx2_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool 
mbox_close)
/* Disable nix bpid config */
otx2_nix_rxchan_bpid_cfg(eth_dev, false);
 
+   /* Disable PTP if already enabled */
+   if (otx2_ethdev_is_ptp_en(dev))
+   otx2_nix_timesync_disable(eth_dev);
+
/* Free up SQs */
for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
otx2_nix_tx_queue_release(eth_dev->data->tx_queues[i]);
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 03ecd32ec..1ca28add4 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -13,6 +13,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "otx2_common.h"
 #include "otx2_dev.h"
@@ -12

[dpdk-dev] [PATCH v2 34/57] net/octeontx2: add flow mbox utility functions

[jerinj]

From: Kiran Kumar K 

Adding mailbox utility functions for rte_flow. These will be used
to alloc, reserve and write the entries to the device on request.

Signed-off-by: Kiran Kumar K 
Signed-off-by: Vivek Sharma 
---
 drivers/net/octeontx2/otx2_flow.h   |   6 +
 drivers/net/octeontx2/otx2_flow_utils.c | 259 
 2 files changed, 265 insertions(+)

diff --git a/drivers/net/octeontx2/otx2_flow.h 
b/drivers/net/octeontx2/otx2_flow.h
index f5cc3b983..a37d86512 100644
--- a/drivers/net/octeontx2/otx2_flow.h
+++ b/drivers/net/octeontx2/otx2_flow.h
@@ -387,4 +387,10 @@ int otx2_flow_parse_actions(struct rte_eth_dev *dev,
 int otx2_flow_free_all_resources(struct otx2_eth_dev *hw);
 
 int otx2_flow_parse_mpls(struct otx2_parse_state *pst, int lid);
+
+int
+flow_validate_and_shift_prio_ent(struct otx2_mbox *mbox, struct rte_flow *flow,
+struct otx2_npc_flow_info *flow_info,
+struct npc_mcam_alloc_entry_rsp *rsp,
+int req_prio);
 #endif /* __OTX2_FLOW_H__ */
diff --git a/drivers/net/octeontx2/otx2_flow_utils.c 
b/drivers/net/octeontx2/otx2_flow_utils.c
index 6078a827b..c56a22ed1 100644
--- a/drivers/net/octeontx2/otx2_flow_utils.c
+++ b/drivers/net/octeontx2/otx2_flow_utils.c
@@ -385,3 +385,262 @@ otx2_flow_keyx_compress(uint64_t *data, uint32_t 
nibble_mask)
data[1] = cdata[1];
 }
 
+static int
+flow_first_set_bit(uint64_t slab)
+{
+   int num = 0;
+
+   if ((slab & 0x) == 0) {
+   num += 32;
+   slab >>= 32;
+   }
+   if ((slab & 0x) == 0) {
+   num += 16;
+   slab >>= 16;
+   }
+   if ((slab & 0xff) == 0) {
+   num += 8;
+   slab >>= 8;
+   }
+   if ((slab & 0xf) == 0) {
+   num += 4;
+   slab >>= 4;
+   }
+   if ((slab & 0x3) == 0) {
+   num += 2;
+   slab >>= 2;
+   }
+   if ((slab & 0x1) == 0)
+   num += 1;
+
+   return num;
+}
+
+static int
+flow_shift_lv_ent(struct otx2_mbox *mbox, struct rte_flow *flow,
+ struct otx2_npc_flow_info *flow_info,
+ uint32_t old_ent, uint32_t new_ent)
+{
+   struct npc_mcam_shift_entry_req *req;
+   struct npc_mcam_shift_entry_rsp *rsp;
+   struct otx2_flow_list *list;
+   struct rte_flow *flow_iter;
+   int rc = 0;
+
+   otx2_npc_dbg("Old ent:%u new ent:%u priority:%u", old_ent, new_ent,
+flow->priority);
+
+   list = &flow_info->flow_list[flow->priority];
+
+   /* Old entry is disabled & it's contents are moved to new_entry,
+* new entry is enabled finally.
+*/
+   req = otx2_mbox_alloc_msg_npc_mcam_shift_entry(mbox);
+   req->curr_entry[0] = old_ent;
+   req->new_entry[0] = new_ent;
+   req->shift_count = 1;
+
+   otx2_mbox_msg_send(mbox, 0);
+   rc = otx2_mbox_get_rsp(mbox, 0, (void *)&rsp);
+   if (rc)
+   return rc;
+
+   /* Remove old node from list */
+   TAILQ_FOREACH(flow_iter, list, next) {
+   if (flow_iter->mcam_id == old_ent)
+   TAILQ_REMOVE(list, flow_iter, next);
+   }
+
+   /* Insert node with new mcam id at right place */
+   TAILQ_FOREACH(flow_iter, list, next) {
+   if (flow_iter->mcam_id > new_ent)
+   TAILQ_INSERT_BEFORE(flow_iter, flow, next);
+   }
+   return rc;
+}
+
+/* Exchange all required entries with a given priority level */
+static int
+flow_shift_ent(struct otx2_mbox *mbox, struct rte_flow *flow,
+  struct otx2_npc_flow_info *flow_info,
+  struct npc_mcam_alloc_entry_rsp *rsp, int dir, int prio_lvl)
+{
+   struct rte_bitmap *fr_bmp, *fr_bmp_rev, *lv_bmp, *lv_bmp_rev, *bmp;
+   uint32_t e_fr = 0, e_lv = 0, e, e_id = 0, mcam_entries;
+   uint64_t fr_bit_pos = 0, lv_bit_pos = 0, bit_pos = 0;
+   /* Bit position within the slab */
+   uint32_t sl_fr_bit_off = 0, sl_lv_bit_off = 0;
+   /* Overall bit position of the start of slab */
+   /* free & live entry index */
+   int rc_fr = 0, rc_lv = 0, rc = 0, idx = 0;
+   struct otx2_mcam_ents_info *ent_info;
+   /* free & live bitmap slab */
+   uint64_t sl_fr = 0, sl_lv = 0, *sl;
+
+   fr_bmp = flow_info->free_entries[prio_lvl];
+   fr_bmp_rev = flow_info->free_entries_rev[prio_lvl];
+   lv_bmp = flow_info->live_entries[prio_lvl];
+   lv_bmp_rev = flow_info->live_entries_rev[prio_lvl];
+   ent_info = &flow_info->flow_entry_info[prio_lvl];
+   mcam_entries = flow_info->mcam_entries;
+
+
+   /* New entries allocated are always contiguous, but older entries
+* already in free/live bitmap can be non-contiguous: so return
+* shifted entries should be in non-contiguous format.
+*/
+   while (idx <= rsp->count) {
+   if (!sl_fr && 

[dpdk-dev] [PATCH v2 33/57] net/octeontx2: add flow utility functions

[jerinj]

From: Kiran Kumar K 

First pass rte_flow utility functions for octeontx2.
These will be used to communicate with AF driver.

Signed-off-by: Kiran Kumar K 
Signed-off-by: Vivek Sharma 
---
 drivers/net/octeontx2/Makefile  |   1 +
 drivers/net/octeontx2/meson.build   |   1 +
 drivers/net/octeontx2/otx2_ethdev.h |   7 +-
 drivers/net/octeontx2/otx2_flow.h   |   2 +
 drivers/net/octeontx2/otx2_flow_utils.c | 387 
 5 files changed, 392 insertions(+), 6 deletions(-)
 create mode 100644 drivers/net/octeontx2/otx2_flow_utils.c

diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index a0155e727..8d1aeae3f 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -37,6 +37,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
otx2_lookup.c   \
otx2_ethdev.c   \
otx2_flow_ctrl.c \
+   otx2_flow_utils.c \
otx2_ethdev_irq.c \
otx2_ethdev_ops.c \
otx2_ethdev_debug.c \
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index 2cac57d2b..75156ddbe 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -12,6 +12,7 @@ sources = files(
'otx2_lookup.c',
'otx2_ethdev.c',
'otx2_flow_ctrl.c',
+   'otx2_flow_utils.c',
'otx2_ethdev_irq.c',
'otx2_ethdev_ops.c',
'otx2_ethdev_debug.c',
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 8f8d93a39..e8a22b6ec 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -17,6 +17,7 @@
 
 #include "otx2_common.h"
 #include "otx2_dev.h"
+#include "otx2_flow.h"
 #include "otx2_irq.h"
 #include "otx2_mempool.h"
 #include "otx2_rx.h"
@@ -173,12 +174,6 @@ struct otx2_eth_qconf {
uint16_t nb_desc;
 };
 
-struct otx2_npc_flow_info {
-   uint16_t channel; /*rx channel */
-   uint16_t flow_prealloc_size;
-   uint16_t flow_max_priority;
-};
-
 struct otx2_fc_info {
enum rte_eth_fc_mode mode;  /**< Link flow control mode */
uint8_t rx_pause;
diff --git a/drivers/net/octeontx2/otx2_flow.h 
b/drivers/net/octeontx2/otx2_flow.h
index 95bb6c2bf..f5cc3b983 100644
--- a/drivers/net/octeontx2/otx2_flow.h
+++ b/drivers/net/octeontx2/otx2_flow.h
@@ -15,6 +15,8 @@
 #include "otx2_ethdev.h"
 #include "otx2_mbox.h"
 
+struct otx2_eth_dev;
+
 int otx2_flow_init(struct otx2_eth_dev *hw);
 int otx2_flow_fini(struct otx2_eth_dev *hw);
 extern const struct rte_flow_ops otx2_flow_ops;
diff --git a/drivers/net/octeontx2/otx2_flow_utils.c 
b/drivers/net/octeontx2/otx2_flow_utils.c
new file mode 100644
index 0..6078a827b
--- /dev/null
+++ b/drivers/net/octeontx2/otx2_flow_utils.c
@@ -0,0 +1,387 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2019 Marvell International Ltd.
+ */
+
+#include "otx2_ethdev.h"
+#include "otx2_flow.h"
+
+int
+otx2_flow_mcam_free_counter(struct otx2_mbox *mbox, uint16_t ctr_id)
+{
+   struct npc_mcam_oper_counter_req *req;
+   int rc;
+
+   req = otx2_mbox_alloc_msg_npc_mcam_free_counter(mbox);
+   req->cntr = ctr_id;
+   otx2_mbox_msg_send(mbox, 0);
+   rc = otx2_mbox_get_rsp(mbox, 0, NULL);
+
+   return rc;
+}
+
+int
+otx2_flow_mcam_read_counter(struct otx2_mbox *mbox, uint32_t ctr_id,
+   uint64_t *count)
+{
+   struct npc_mcam_oper_counter_req *req;
+   struct npc_mcam_oper_counter_rsp *rsp;
+   int rc;
+
+   req = otx2_mbox_alloc_msg_npc_mcam_counter_stats(mbox);
+   req->cntr = ctr_id;
+   otx2_mbox_msg_send(mbox, 0);
+   rc = otx2_mbox_get_rsp(mbox, 0, (void *)&rsp);
+
+   *count = rsp->stat;
+   return rc;
+}
+
+int
+otx2_flow_mcam_clear_counter(struct otx2_mbox *mbox, uint32_t ctr_id)
+{
+   struct npc_mcam_oper_counter_req *req;
+   int rc;
+
+   req = otx2_mbox_alloc_msg_npc_mcam_clear_counter(mbox);
+   req->cntr = ctr_id;
+   otx2_mbox_msg_send(mbox, 0);
+   rc = otx2_mbox_get_rsp(mbox, 0, NULL);
+
+   return rc;
+}
+
+int
+otx2_flow_mcam_free_entry(struct otx2_mbox *mbox, uint32_t entry)
+{
+   struct npc_mcam_free_entry_req *req;
+   int rc;
+
+   req = otx2_mbox_alloc_msg_npc_mcam_free_entry(mbox);
+   req->entry = entry;
+   otx2_mbox_msg_send(mbox, 0);
+   rc = otx2_mbox_get_rsp(mbox, 0, NULL);
+
+   return rc;
+}
+
+int
+otx2_flow_mcam_free_all_entries(struct otx2_mbox *mbox)
+{
+   struct npc_mcam_free_entry_req *req;
+   int rc;
+
+   req = otx2_mbox_alloc_msg_npc_mcam_free_entry(mbox);
+   req->all = 1;
+   otx2_mbox_msg_send(mbox, 0);
+   rc = otx2_mbox_get_rsp(mbox, 0, NULL);
+
+   return rc;
+}
+
+static void
+flow_prep_mcam_ldata(uint8_t *ptr, const uint8_t *data, int len)
+{
+   int idx;
+
+   for (idx = 0; idx < len; idx++)
+   ptr[i

[dpdk-dev] [PATCH v2 49/57] net/octeontx2: add Rx multi segment version

[jerinj]

From: Nithin Dabilpuram 

Add multi segment version of packet Receive function.

Signed-off-by: Nithin Dabilpuram 
Signed-off-by: Pavan Nikhilesh 
---
 doc/guides/nics/features/octeontx2.ini |  2 +
 doc/guides/nics/features/octeontx2_vec.ini |  1 +
 doc/guides/nics/features/octeontx2_vf.ini  |  2 +
 doc/guides/nics/octeontx2.rst  |  2 +
 drivers/net/octeontx2/otx2_rx.c| 25 ++
 drivers/net/octeontx2/otx2_rx.h| 55 +-
 6 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index 211ff93e7..3280cba78 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -24,6 +24,8 @@ Inner RSS= Y
 VLAN filter  = Y
 Flow control = Y
 Flow API = Y
+Jumbo frame  = Y
+Scattered Rx = Y
 VLAN offload = Y
 QinQ offload = Y
 Packet type parsing  = Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index 967a3757d..315722e60 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -24,6 +24,7 @@ Inner RSS= Y
 VLAN filter  = Y
 Flow control = Y
 Flow API = Y
+Jumbo frame  = Y
 VLAN offload = Y
 QinQ offload = Y
 Packet type parsing  = Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
index 884167c88..17b223221 100644
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -19,6 +19,8 @@ RSS reta update  = Y
 Inner RSS= Y
 VLAN filter  = Y
 Flow API = Y
+Jumbo frame  = Y
+Scattered Rx = Y
 VLAN offload = Y
 QinQ offload = Y
 Packet type parsing  = Y
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index d6082e508..3d9fc5f1d 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -18,6 +18,7 @@ Features of the OCTEON TX2 Ethdev PMD are:
 
 - Packet type information
 - Promiscuous mode
+- Jumbo frames
 - SR-IOV VF
 - Lock-free Tx queue
 - Multiple queues for TX and RX
@@ -28,6 +29,7 @@ Features of the OCTEON TX2 Ethdev PMD are:
 - Port hardware statistics
 - Link state information
 - Link flow control
+- Scatter-Gather IO support
 - Debug utilities - Context dump and error interrupt support
 - IEEE1588 timestamping
 
diff --git a/drivers/net/octeontx2/otx2_rx.c b/drivers/net/octeontx2/otx2_rx.c
index 4d5223e10..fca182785 100644
--- a/drivers/net/octeontx2/otx2_rx.c
+++ b/drivers/net/octeontx2/otx2_rx.c
@@ -92,6 +92,14 @@ otx2_nix_recv_pkts_ ## name(void *rx_queue,  
   \
 { \
return nix_recv_pkts(rx_queue, rx_pkts, pkts, (flags));\
 } \
+  \
+static uint16_t __rte_noinline __hot  \
+otx2_nix_recv_pkts_mseg_ ## name(void *rx_queue,  \
+   struct rte_mbuf **rx_pkts, uint16_t pkts)  \
+{ \
+   return nix_recv_pkts(rx_queue, rx_pkts, pkts,  \
+(flags) | NIX_RX_MULTI_SEG_F);\
+} \
 
 NIX_RX_FASTPATH_MODES
 #undef R
@@ -115,15 +123,32 @@ pick_rx_func(struct rte_eth_dev *eth_dev,
 void
 otx2_eth_set_rx_function(struct rte_eth_dev *eth_dev)
 {
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+
const eth_rx_burst_t nix_eth_rx_burst[2][2][2][2][2][2] = {
 #define R(name, f5, f4, f3, f2, f1, f0, flags) \
[f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_ ## name,
 
+NIX_RX_FASTPATH_MODES
+#undef R
+   };
+
+   const eth_rx_burst_t nix_eth_rx_burst_mseg[2][2][2][2][2][2] = {
+#define R(name, f5, f4, f3, f2, f1, f0, flags) \
+   [f5][f4][f3][f2][f1][f0] =  otx2_nix_recv_pkts_mseg_ ## name,
+
 NIX_RX_FASTPATH_MODES
 #undef R
};
 
pick_rx_func(eth_dev, nix_eth_rx_burst);
 
+   if (dev->rx_offloads & DEV_RX_OFFLOAD_SCATTER)
+   pick_rx_func(eth_dev, nix_eth_rx_burst_mseg);
+
+   /* Copy multi seg version with no offload for tear down sequence */
+   if (rte_eal_process_type() == RTE_PROC_PRIMARY)
+   dev->rx_pkt_burst_no_offload =
+   nix_eth_rx_burst_mseg[0][0][0][0][0][0];
rte_mb();
 }
diff --git a/drivers/net/octeontx2/otx2_rx.h b/drivers/net/oct

[dpdk-dev] [PATCH v2 48/57] net/octeontx2: add Rx burst support

[jerinj]

From: Jerin Jacob 

Add Rx burst support.

Signed-off-by: Jerin Jacob 
Signed-off-by: Nithin Dabilpuram 
Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Harman Kalra 
---
 drivers/net/octeontx2/Makefile  |   1 +
 drivers/net/octeontx2/meson.build   |   2 +-
 drivers/net/octeontx2/otx2_ethdev.c |   6 -
 drivers/net/octeontx2/otx2_ethdev.h |   2 +
 drivers/net/octeontx2/otx2_rx.c | 129 +++
 drivers/net/octeontx2/otx2_rx.h | 247 
 6 files changed, 380 insertions(+), 7 deletions(-)
 create mode 100644 drivers/net/octeontx2/otx2_rx.c

diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index d22ddae33..3e25d2ad4 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -28,6 +28,7 @@ LIBABIVER := 1
 # all source are stored in SRCS-y
 #
 SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
+   otx2_rx.c   \
otx2_tm.c   \
otx2_rss.c  \
otx2_mac.c  \
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index 6281ee21b..975b2e715 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -2,7 +2,7 @@
 # Copyright(C) 2019 Marvell International Ltd.
 #
 
-sources = files(
+sources = files('otx2_rx.c',
'otx2_tm.c',
'otx2_rss.c',
'otx2_mac.c',
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 15f46a9bf..1f8a22300 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -14,12 +14,6 @@
 
 #include "otx2_ethdev.h"
 
-static inline void
-otx2_eth_set_rx_function(struct rte_eth_dev *eth_dev)
-{
-   RTE_SET_USED(eth_dev);
-}
-
 static inline void
 otx2_eth_set_tx_function(struct rte_eth_dev *eth_dev)
 {
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index e18483969..22cf86981 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -280,6 +280,7 @@ struct otx2_eth_dev {
struct otx2_eth_qconf *tx_qconf;
struct otx2_eth_qconf *rx_qconf;
struct rte_eth_dev *eth_dev;
+   eth_rx_burst_t rx_pkt_burst_no_offload;
/* PTP counters */
bool ptp_en;
struct otx2_timesync_info tstamp;
@@ -482,6 +483,7 @@ int otx2_ethdev_parse_devargs(struct rte_devargs *devargs,
  struct otx2_eth_dev *dev);
 
 /* Rx and Tx routines */
+void otx2_eth_set_rx_function(struct rte_eth_dev *eth_dev);
 void otx2_nix_form_default_desc(struct otx2_eth_txq *txq);
 
 /* Timesync - PTP routines */
diff --git a/drivers/net/octeontx2/otx2_rx.c b/drivers/net/octeontx2/otx2_rx.c
new file mode 100644
index 0..4d5223e10
--- /dev/null
+++ b/drivers/net/octeontx2/otx2_rx.c
@@ -0,0 +1,129 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2019 Marvell International Ltd.
+ */
+
+#include 
+
+#include "otx2_ethdev.h"
+#include "otx2_rx.h"
+
+#define NIX_DESCS_PER_LOOP 4
+#define CQE_CAST(x)((struct nix_cqe_hdr_s *)(x))
+#define CQE_SZ(x)  ((x) * NIX_CQ_ENTRY_SZ)
+
+static inline uint16_t
+nix_rx_nb_pkts(struct otx2_eth_rxq *rxq, const uint64_t wdata,
+  const uint16_t pkts, const uint32_t qmask)
+{
+   uint32_t available = rxq->available;
+
+   /* Update the available count if cached value is not enough */
+   if (unlikely(available < pkts)) {
+   uint64_t reg, head, tail;
+
+   /* Use LDADDA version to avoid reorder */
+   reg = otx2_atomic64_add_sync(wdata, rxq->cq_status);
+   /* CQ_OP_STATUS operation error */
+   if (reg & BIT_ULL(CQ_OP_STAT_OP_ERR) ||
+   reg & BIT_ULL(CQ_OP_STAT_CQ_ERR))
+   return 0;
+
+   tail = reg & 0xF;
+   head = (reg >> 20) & 0xF;
+   if (tail < head)
+   available = tail - head + qmask + 1;
+   else
+   available = tail - head;
+
+   rxq->available = available;
+   }
+
+   return RTE_MIN(pkts, available);
+}
+
+static __rte_always_inline uint16_t
+nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
+ uint16_t pkts, const uint16_t flags)
+{
+   struct otx2_eth_rxq *rxq = rx_queue;
+   const uint64_t mbuf_init = rxq->mbuf_initializer;
+   const void *lookup_mem = rxq->lookup_mem;
+   const uint64_t data_off = rxq->data_off;
+   const uintptr_t desc = rxq->desc;
+   const uint64_t wdata = rxq->wdata;
+   const uint32_t qmask = rxq->qmask;
+   uint16_t packets = 0, nb_pkts;
+   uint32_t head = rxq->head;
+   struct nix_cqe_hdr_s *cq;
+   struct rte_mbuf *mbuf;
+
+   nb_pkts = nix_rx_nb_pkts(rxq, wdata, pkts, qmask);
+
+   while (packets < nb_pkts) {
+   /* Prefetch N desc ahead */
+   rte_prefetch_n

[dpdk-dev] [PATCH v2 35/57] net/octeontx2: add flow MCAM utility functions

[jerinj]

From: Kiran Kumar K 

Adding MCAM utility functions to alloc and write the entries.
These will be used to arrange the flow rules based on priority.

Signed-off-by: Kiran Kumar K 
Signed-off-by: Vivek Sharma 
---
 drivers/net/octeontx2/otx2_flow.h   |   6 -
 drivers/net/octeontx2/otx2_flow_utils.c | 266 +++-
 2 files changed, 265 insertions(+), 7 deletions(-)

diff --git a/drivers/net/octeontx2/otx2_flow.h 
b/drivers/net/octeontx2/otx2_flow.h
index a37d86512..f5cc3b983 100644
--- a/drivers/net/octeontx2/otx2_flow.h
+++ b/drivers/net/octeontx2/otx2_flow.h
@@ -387,10 +387,4 @@ int otx2_flow_parse_actions(struct rte_eth_dev *dev,
 int otx2_flow_free_all_resources(struct otx2_eth_dev *hw);
 
 int otx2_flow_parse_mpls(struct otx2_parse_state *pst, int lid);
-
-int
-flow_validate_and_shift_prio_ent(struct otx2_mbox *mbox, struct rte_flow *flow,
-struct otx2_npc_flow_info *flow_info,
-struct npc_mcam_alloc_entry_rsp *rsp,
-int req_prio);
 #endif /* __OTX2_FLOW_H__ */
diff --git a/drivers/net/octeontx2/otx2_flow_utils.c 
b/drivers/net/octeontx2/otx2_flow_utils.c
index c56a22ed1..8a0fe7615 100644
--- a/drivers/net/octeontx2/otx2_flow_utils.c
+++ b/drivers/net/octeontx2/otx2_flow_utils.c
@@ -5,6 +5,22 @@
 #include "otx2_ethdev.h"
 #include "otx2_flow.h"
 
+static int
+flow_mcam_alloc_counter(struct otx2_mbox *mbox, uint16_t *ctr)
+{
+   struct npc_mcam_alloc_counter_req *req;
+   struct npc_mcam_alloc_counter_rsp *rsp;
+   int rc;
+
+   req = otx2_mbox_alloc_msg_npc_mcam_alloc_counter(mbox);
+   req->count = 1;
+   otx2_mbox_msg_send(mbox, 0);
+   rc = otx2_mbox_get_rsp(mbox, 0, (void *)&rsp);
+
+   *ctr = rsp->cntr_list[0];
+   return rc;
+}
+
 int
 otx2_flow_mcam_free_counter(struct otx2_mbox *mbox, uint16_t ctr_id)
 {
@@ -585,7 +601,7 @@ flow_shift_ent(struct otx2_mbox *mbox, struct rte_flow 
*flow,
  * since NPC_MCAM_LOWER_PRIO & NPC_MCAM_HIGHER_PRIO don't ensure zone accuracy.
  * If not properly aligned, shift entries to do so
  */
-int
+static int
 flow_validate_and_shift_prio_ent(struct otx2_mbox *mbox, struct rte_flow *flow,
 struct otx2_npc_flow_info *flow_info,
 struct npc_mcam_alloc_entry_rsp *rsp,
@@ -644,3 +660,251 @@ flow_validate_and_shift_prio_ent(struct otx2_mbox *mbox, 
struct rte_flow *flow,
 
return rc;
 }
+
+static int
+flow_find_ref_entry(struct otx2_npc_flow_info *flow_info, int *prio,
+   int prio_lvl)
+{
+   struct otx2_mcam_ents_info *info = flow_info->flow_entry_info;
+   int step = 1;
+
+   while (step < flow_info->flow_max_priority) {
+   if (((prio_lvl + step) < flow_info->flow_max_priority) &&
+   info[prio_lvl + step].live_ent) {
+   *prio = NPC_MCAM_HIGHER_PRIO;
+   return info[prio_lvl + step].min_id;
+   }
+
+   if (((prio_lvl - step) >= 0) &&
+   info[prio_lvl - step].live_ent) {
+   otx2_npc_dbg("Prio_lvl %u live %u", prio_lvl - step,
+info[prio_lvl - step].live_ent);
+   *prio = NPC_MCAM_LOWER_PRIO;
+   return info[prio_lvl - step].max_id;
+   }
+   step++;
+   }
+   *prio = NPC_MCAM_ANY_PRIO;
+   return 0;
+}
+
+static int
+flow_fill_entry_cache(struct otx2_mbox *mbox, struct rte_flow *flow,
+ struct otx2_npc_flow_info *flow_info, uint32_t *free_ent)
+{
+   struct rte_bitmap *free_bmp, *free_bmp_rev, *live_bmp, *live_bmp_rev;
+   struct npc_mcam_alloc_entry_rsp rsp_local;
+   struct npc_mcam_alloc_entry_rsp *rsp_cmd;
+   struct npc_mcam_alloc_entry_req *req;
+   struct npc_mcam_alloc_entry_rsp *rsp;
+   struct otx2_mcam_ents_info *info;
+   uint16_t ref_ent, idx;
+   int rc, prio;
+
+   info = &flow_info->flow_entry_info[flow->priority];
+   free_bmp = flow_info->free_entries[flow->priority];
+   free_bmp_rev = flow_info->free_entries_rev[flow->priority];
+   live_bmp = flow_info->live_entries[flow->priority];
+   live_bmp_rev = flow_info->live_entries_rev[flow->priority];
+
+   ref_ent = flow_find_ref_entry(flow_info, &prio, flow->priority);
+
+   req = otx2_mbox_alloc_msg_npc_mcam_alloc_entry(mbox);
+   req->contig = 1;
+   req->count = flow_info->flow_prealloc_size;
+   req->priority = prio;
+   req->ref_entry = ref_ent;
+
+   otx2_npc_dbg("Fill cache ref entry %u prio %u", ref_ent, prio);
+
+   otx2_mbox_msg_send(mbox, 0);
+   rc = otx2_mbox_get_rsp(mbox, 0, (void *)&rsp_cmd);
+   if (rc)
+   return rc;
+
+   rsp = &rsp_local;
+   memcpy(rsp, rsp_cmd, sizeof(*rsp));
+
+   otx2_npc_dbg("Alloc entry %u count %u , prio = %d", rsp->entry,
+  

[dpdk-dev] [PATCH v2 50/57] net/octeontx2: add Rx vector version

[jerinj]

From: Jerin Jacob 

Add vector version of packet Receive function.

Signed-off-by: Jerin Jacob 
Signed-off-by: Nithin Dabilpuram 
---
 doc/guides/nics/octeontx2.rst |   1 +
 drivers/net/octeontx2/Makefile|   1 +
 drivers/net/octeontx2/meson.build |   2 +
 drivers/net/octeontx2/otx2_rx.c   | 259 +-
 4 files changed, 262 insertions(+), 1 deletion(-)

diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index 3d9fc5f1d..9d6596ad8 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -30,6 +30,7 @@ Features of the OCTEON TX2 Ethdev PMD are:
 - Link state information
 - Link flow control
 - Scatter-Gather IO support
+- Vector Poll mode driver
 - Debug utilities - Context dump and error interrupt support
 - IEEE1588 timestamping
 
diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index 3e25d2ad4..a5f125655 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -14,6 +14,7 @@ CFLAGS += -I$(RTE_SDK)/drivers/common/octeontx2
 CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx2
 CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx2
 CFLAGS += -O3
+CFLAGS += -flax-vector-conversions
 
 ifneq ($(CONFIG_RTE_ARCH_64),y)
 CFLAGS += -Wno-int-to-pointer-cast
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index 975b2e715..9d151f88d 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -24,6 +24,8 @@ sources = files('otx2_rx.c',
 
 deps += ['bus_pci', 'common_octeontx2', 'mempool_octeontx2']
 
+cflags += ['-flax-vector-conversions']
+
 extra_flags = []
 # This integrated controller runs only on a arm64 machine, remove 32bit 
warnings
 if not dpdk_conf.get('RTE_ARCH_64')
diff --git a/drivers/net/octeontx2/otx2_rx.c b/drivers/net/octeontx2/otx2_rx.c
index fca182785..deefe9588 100644
--- a/drivers/net/octeontx2/otx2_rx.c
+++ b/drivers/net/octeontx2/otx2_rx.c
@@ -84,6 +84,239 @@ nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
return nb_pkts;
 }
 
+#if defined(RTE_ARCH_ARM64)
+
+static __rte_always_inline uint64_t
+nix_vlan_update(const uint64_t w2, uint64_t ol_flags, uint8x16_t *f)
+{
+   if (w2 & BIT_ULL(21) /* vtag0_gone */) {
+   ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
+   *f = vsetq_lane_u16((uint16_t)(w2 >> 32), *f, 5);
+   }
+
+   return ol_flags;
+}
+
+static __rte_always_inline uint64_t
+nix_qinq_update(const uint64_t w2, uint64_t ol_flags, struct rte_mbuf *mbuf)
+{
+   if (w2 & BIT_ULL(23) /* vtag1_gone */) {
+   ol_flags |= PKT_RX_QINQ | PKT_RX_QINQ_STRIPPED;
+   mbuf->vlan_tci_outer = (uint16_t)(w2 >> 48);
+   }
+
+   return ol_flags;
+}
+
+static __rte_always_inline uint16_t
+nix_recv_pkts_vector(void *rx_queue, struct rte_mbuf **rx_pkts,
+uint16_t pkts, const uint16_t flags)
+{
+   struct otx2_eth_rxq *rxq = rx_queue; uint16_t packets = 0;
+   uint64x2_t cq0_w8, cq1_w8, cq2_w8, cq3_w8, mbuf01, mbuf23;
+   const uint64_t mbuf_initializer = rxq->mbuf_initializer;
+   const uint64x2_t data_off = vdupq_n_u64(rxq->data_off);
+   uint64_t ol_flags0, ol_flags1, ol_flags2, ol_flags3;
+   uint64x2_t rearm0 = vdupq_n_u64(mbuf_initializer);
+   uint64x2_t rearm1 = vdupq_n_u64(mbuf_initializer);
+   uint64x2_t rearm2 = vdupq_n_u64(mbuf_initializer);
+   uint64x2_t rearm3 = vdupq_n_u64(mbuf_initializer);
+   struct rte_mbuf *mbuf0, *mbuf1, *mbuf2, *mbuf3;
+   const uint16_t *lookup_mem = rxq->lookup_mem;
+   const uint32_t qmask = rxq->qmask;
+   const uint64_t wdata = rxq->wdata;
+   const uintptr_t desc = rxq->desc;
+   uint8x16_t f0, f1, f2, f3;
+   uint32_t head = rxq->head;
+
+   pkts = nix_rx_nb_pkts(rxq, wdata, pkts, qmask);
+   /* Packets has to be floor-aligned to NIX_DESCS_PER_LOOP */
+   pkts = RTE_ALIGN_FLOOR(pkts, NIX_DESCS_PER_LOOP);
+
+   while (packets < pkts) {
+   /* Get the CQ pointers, since the ring size is multiple of
+* 4, We can avoid checking the wrap around of head
+* value after the each access unlike scalar version.
+*/
+   const uintptr_t cq0 = desc + CQE_SZ(head);
+
+   /* Prefetch N desc ahead */
+   rte_prefetch_non_temporal((void *)(cq0 + CQE_SZ(8)));
+   rte_prefetch_non_temporal((void *)(cq0 + CQE_SZ(9)));
+   rte_prefetch_non_temporal((void *)(cq0 + CQE_SZ(10)));
+   rte_prefetch_non_temporal((void *)(cq0 + CQE_SZ(11)));
+
+   /* Get NIX_RX_SG_S for size and buffer pointer */
+   cq0_w8 = vld1q_u64((uint64_t *)(cq0 + CQE_SZ(0) + 64));
+   cq1_w8 = vld1q_u64((uint64_t *)(cq0 + CQE_SZ(1) + 64));
+   cq2_w8 = vld1q_u64((uint64_t *)(cq0 + CQE_SZ(2) + 64));
+   cq3_w8 = vld1q_u64((uint64_t *)(cq0 + CQE_SZ(3) + 64));
+

[dpdk-dev] [PATCH v2 45/57] net/octeontx2: support VLAN filters

[jerinj]

From: Vivek Sharma 

Support setting up VLAN filters so as to allow tagged
packet's reception after VLAN HW Filter offload is enabled.

Signed-off-by: Vivek Sharma 
---
 doc/guides/nics/features/octeontx2.ini |   1 +
 doc/guides/nics/features/octeontx2_vec.ini |   1 +
 doc/guides/nics/features/octeontx2_vf.ini  |   1 +
 doc/guides/nics/octeontx2.rst  |   2 +-
 drivers/net/octeontx2/otx2_ethdev.c|   2 +
 drivers/net/octeontx2/otx2_ethdev.h|   4 +
 drivers/net/octeontx2/otx2_vlan.c  | 149 -
 7 files changed, 157 insertions(+), 3 deletions(-)

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index ac4712b0c..37b802999 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -21,6 +21,7 @@ RSS hash = Y
 RSS key update   = Y
 RSS reta update  = Y
 Inner RSS= Y
+VLAN filter  = Y
 Flow control = Y
 Flow API = Y
 VLAN offload = Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index e54c1babe..ccedd1359 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -21,6 +21,7 @@ RSS hash = Y
 RSS key update   = Y
 RSS reta update  = Y
 Inner RSS= Y
+VLAN filter  = Y
 Flow control = Y
 Flow API = Y
 VLAN offload = Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
index 769ab16ee..24df14717 100644
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -17,6 +17,7 @@ RSS hash = Y
 RSS key update   = Y
 RSS reta update  = Y
 Inner RSS= Y
+VLAN filter  = Y
 Flow API = Y
 VLAN offload = Y
 QinQ offload = Y
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index a53b71a6d..d6082e508 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -22,7 +22,7 @@ Features of the OCTEON TX2 Ethdev PMD are:
 - Lock-free Tx queue
 - Multiple queues for TX and RX
 - Receiver Side Scaling (RSS)
-- MAC filtering
+- MAC/VLAN filtering
 - Generic flow API
 - VLAN/QinQ stripping and insertion
 - Port hardware statistics
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 55a5cdc48..78cbd8811 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -1346,6 +1346,8 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.timesync_read_time   = otx2_nix_timesync_read_time,
.timesync_write_time  = otx2_nix_timesync_write_time,
.vlan_offload_set = otx2_nix_vlan_offload_set,
+   .vlan_filter_set  = otx2_nix_vlan_filter_set,
+   .vlan_strip_queue_set = otx2_nix_vlan_strip_queue_set,
 };
 
 static inline int
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 50fd18b6e..996ddec47 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -450,6 +450,10 @@ int otx2_nix_vlan_offload_init(struct rte_eth_dev 
*eth_dev);
 int otx2_nix_vlan_fini(struct rte_eth_dev *eth_dev);
 int otx2_nix_vlan_offload_set(struct rte_eth_dev *eth_dev, int mask);
 void otx2_nix_vlan_update_promisc(struct rte_eth_dev *eth_dev, int enable);
+int otx2_nix_vlan_filter_set(struct rte_eth_dev *eth_dev, uint16_t vlan_id,
+int on);
+void otx2_nix_vlan_strip_queue_set(struct rte_eth_dev *dev,
+   uint16_t queue, int on);
 
 /* Lookup configuration */
 void *otx2_nix_fastpath_lookup_mem_get(void);
diff --git a/drivers/net/octeontx2/otx2_vlan.c 
b/drivers/net/octeontx2/otx2_vlan.c
index 7cf4f3136..6216d6545 100644
--- a/drivers/net/octeontx2/otx2_vlan.c
+++ b/drivers/net/octeontx2/otx2_vlan.c
@@ -22,8 +22,8 @@ enum vtag_cfg_dir {
 };
 
 static int
-__rte_unused nix_vlan_mcam_enb_dis(struct otx2_eth_dev *dev,
-  uint32_t entry, const int enable)
+nix_vlan_mcam_enb_dis(struct otx2_eth_dev *dev,
+ uint32_t entry, const int enable)
 {
struct npc_mcam_ena_dis_entry_req *req;
struct otx2_mbox *mbox = dev->mbox;
@@ -460,6 +460,8 @@ nix_vlan_hw_filter(struct rte_eth_dev *eth_dev, const 
uint8_t enable,
   uint16_t vlan_id)
 {
struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+   struct otx2_vlan_info *vlan = &dev->vlan_info;
+   struct vlan_entry *entry;
int rc = -EINVAL;
 
if (!vlan_id && enable) {
@@ -473,6 +475,24 @@ nix_vlan_hw_filter(struct rte_eth_dev *eth_dev, const 
uint8_t enable,
return 0;
}
 
+   /* Enable/disable existing vlan filter entries */
+   TAILQ_FOREACH(entry, &v

[dpdk-dev] [PATCH v2 54/57] net/octeontx2: add device start operation

[jerinj]

From: Nithin Dabilpuram 

Add device start operation and update the correct
function pointers for Rx and Tx burst functions.

This patch also update the octeontx2 NIC specific
documentation.

Signed-off-by: Nithin Dabilpuram 
Signed-off-by: Vamsi Attunuru 
Signed-off-by: Jerin Jacob 
---
 doc/guides/nics/octeontx2.rst   |  91 
 drivers/net/octeontx2/otx2_ethdev.c | 180 
 drivers/net/octeontx2/otx2_flow.c   |   4 +-
 drivers/net/octeontx2/otx2_flow_parse.c |   4 +-
 drivers/net/octeontx2/otx2_ptp.c|   8 ++
 drivers/net/octeontx2/otx2_vlan.c   |   1 +
 6 files changed, 286 insertions(+), 2 deletions(-)

diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index 90ca4e2d2..d4a458262 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -34,6 +34,7 @@ Features of the OCTEON TX2 Ethdev PMD are:
 - Vector Poll mode driver
 - Debug utilities - Context dump and error interrupt support
 - IEEE1588 timestamping
+- HW offloaded `ethdev Rx queue` to `eventdev event queue` packet injection
 
 Prerequisites
 -
@@ -49,6 +50,63 @@ The following options may be modified in the ``config`` file.
 
   Toggle compilation of the ``librte_pmd_octeontx2`` driver.
 
+Driver compilation and testing
+--
+
+Refer to the document :ref:`compiling and testing a PMD for a NIC 
`
+for details.
+
+To compile the OCTEON TX2 PMD for Linux arm64 gcc,
+use arm64-octeontx2-linux-gcc as target.
+
+#. Running testpmd:
+
+   Follow instructions available in the document
+   :ref:`compiling and testing a PMD for a NIC `
+   to run testpmd.
+
+   Example output:
+
+   .. code-block:: console
+
+  ./build/app/testpmd -c 0x300 -w 0002:02:00.0 -- --portmask=0x1 
--nb-cores=1 --port-topology=loop --rxq=1 --txq=1
+  EAL: Detected 24 lcore(s)
+  EAL: Detected 1 NUMA nodes
+  EAL: Multi-process socket /var/run/dpdk/rte/mp_socket
+  EAL: No available hugepages reported in hugepages-2048kB
+  EAL: Probing VFIO support...
+  EAL: VFIO support initialized
+  EAL: PCI device 0002:02:00.0 on NUMA socket 0
+  EAL:   probe driver: 177d:a063 net_octeontx2
+  EAL:   using IOMMU type 1 (Type 1)
+  testpmd: create a new mbuf pool : n=267456, 
size=2176, socket=0
+  testpmd: preferred mempool ops selected: octeontx2_npa
+  Configuring Port 0 (socket 0)
+  PMD: Port 0: Link Up - speed 4 Mbps - full-duplex
+
+  Port 0: link state change event
+  Port 0: 36:10:66:88:7A:57
+  Checking link statuses...
+  Done
+  No commandline core given, start packet forwarding
+  io packet forwarding - ports=1 - cores=1 - streams=1 - NUMA support 
enabled, MP allocation mode: native
+  Logical Core 9 (socket 0) forwards packets on 1 streams:
+RX P=0/Q=0 (socket 0) -> TX P=0/Q=0 (socket 0) peer=02:00:00:00:00:00
+
+io packet forwarding packets/burst=32
+nb forwarding cores=1 - nb forwarding ports=1
+port 0: RX queue number: 1 Tx queue number: 1
+  Rx offloads=0x0 Tx offloads=0x1
+  RX queue: 0
+RX desc=512 - RX free threshold=0
+RX threshold registers: pthresh=0 hthresh=0  wthresh=0
+RX Offloads=0x0
+  TX queue: 0
+TX desc=512 - TX free threshold=0
+TX threshold registers: pthresh=0 hthresh=0  wthresh=0
+TX offloads=0x1 - TX RS bit threshold=0
+  Press enter to exit
+
 Runtime Config Options
 --
 
@@ -116,6 +174,39 @@ Runtime Config Options
parameters to all the PCIe devices if application requires to configure on
all the ethdev ports.
 
+Limitations
+---
+
+``mempool_octeontx2`` external mempool handler dependency
+~
+
+The OCTEON TX2 SoC family NIC has inbuilt HW assisted external mempool manager.
+``net_octeontx2`` pmd only works with ``mempool_octeontx2`` mempool handler
+as it is performance wise most effective way for packet allocation and Tx 
buffer
+recycling on OCTEON TX2 SoC platform.
+
+CRC striping
+
+
+The OCTEON TX2 SoC family NICs strip the CRC for every packet being received by
+the host interface irrespective of the offload configuration.
+
+
+Debugging Options
+-
+
+.. _table_octeontx2_ethdev_debug_options:
+
+.. table:: OCTEON TX2 ethdev debug options
+
+   +---++---+
+   | # | Component  | EAL log command   |
+   +===++===+
+   | 1 | NIX| --log-level='pmd\.net.octeontx2,8'|
+   +---++---+
+   | 2 | NPC| --log-level='pmd\.net.octeontx2\.flow,8'  |
+   +---++---

[dpdk-dev] [PATCH v2 53/57] net/octeontx2: add Tx vector version

[jerinj]

From: Nithin Dabilpuram 

Add vector version of packet transmit function.

Signed-off-by: Nithin Dabilpuram 
Signed-off-by: Pavan Nikhilesh 
---
 drivers/net/octeontx2/otx2_tx.c | 883 +++-
 1 file changed, 882 insertions(+), 1 deletion(-)

diff --git a/drivers/net/octeontx2/otx2_tx.c b/drivers/net/octeontx2/otx2_tx.c
index 0ac5ea652..6bce55112 100644
--- a/drivers/net/octeontx2/otx2_tx.c
+++ b/drivers/net/octeontx2/otx2_tx.c
@@ -80,6 +80,859 @@ nix_xmit_pkts_mseg(void *tx_queue, struct rte_mbuf 
**tx_pkts,
return pkts;
 }
 
+#if defined(RTE_ARCH_ARM64)
+
+#define NIX_DESCS_PER_LOOP 4
+static __rte_always_inline uint16_t
+nix_xmit_pkts_vector(void *tx_queue, struct rte_mbuf **tx_pkts,
+uint16_t pkts, const uint16_t flags)
+{
+   uint64x2_t dataoff_iova0, dataoff_iova1, dataoff_iova2, dataoff_iova3;
+   uint64x2_t len_olflags0, len_olflags1, len_olflags2, len_olflags3;
+   uint64_t *mbuf0, *mbuf1, *mbuf2, *mbuf3;
+   uint64x2_t senddesc01_w0, senddesc23_w0;
+   uint64x2_t senddesc01_w1, senddesc23_w1;
+   uint64x2_t sgdesc01_w0, sgdesc23_w0;
+   uint64x2_t sgdesc01_w1, sgdesc23_w1;
+   struct otx2_eth_txq *txq = tx_queue;
+   uint64_t *lmt_addr = txq->lmt_addr;
+   rte_iova_t io_addr = txq->io_addr;
+   uint64x2_t ltypes01, ltypes23;
+   uint64x2_t xtmp128, ytmp128;
+   uint64x2_t xmask01, xmask23;
+   uint64x2_t mbuf01, mbuf23;
+   uint64x2_t cmd00, cmd01;
+   uint64x2_t cmd10, cmd11;
+   uint64x2_t cmd20, cmd21;
+   uint64x2_t cmd30, cmd31;
+   uint64_t lmt_status, i;
+
+   pkts = RTE_ALIGN_FLOOR(pkts, NIX_DESCS_PER_LOOP);
+
+   NIX_XMIT_FC_OR_RETURN(txq, pkts);
+
+   /* Reduce the cached count */
+   txq->fc_cache_pkts -= pkts;
+
+   /* Lets commit any changes in the packet */
+   rte_cio_wmb();
+
+   senddesc01_w0 = vld1q_dup_u64(&txq->cmd[0]);
+   senddesc23_w0 = senddesc01_w0;
+   senddesc01_w1 = vdupq_n_u64(0);
+   senddesc23_w1 = senddesc01_w1;
+   sgdesc01_w0 = vld1q_dup_u64(&txq->cmd[2]);
+   sgdesc23_w0 = sgdesc01_w0;
+
+   for (i = 0; i < pkts; i += NIX_DESCS_PER_LOOP) {
+   mbuf01 = vld1q_u64((uint64_t *)tx_pkts);
+   mbuf23 = vld1q_u64((uint64_t *)(tx_pkts + 2));
+
+   /* Clear lower 32bit of SEND_HDR_W0 and SEND_SG_W0 */
+   senddesc01_w0 = vbicq_u64(senddesc01_w0,
+ vdupq_n_u64(0x));
+   sgdesc01_w0 = vbicq_u64(sgdesc01_w0,
+   vdupq_n_u64(0x));
+
+   senddesc23_w0 = senddesc01_w0;
+   sgdesc23_w0 = sgdesc01_w0;
+
+   tx_pkts = tx_pkts + NIX_DESCS_PER_LOOP;
+
+   /* Move mbufs to iova */
+   mbuf0 = (uint64_t *)vgetq_lane_u64(mbuf01, 0);
+   mbuf1 = (uint64_t *)vgetq_lane_u64(mbuf01, 1);
+   mbuf2 = (uint64_t *)vgetq_lane_u64(mbuf23, 0);
+   mbuf3 = (uint64_t *)vgetq_lane_u64(mbuf23, 1);
+
+   mbuf0 = (uint64_t *)((uintptr_t)mbuf0 +
+offsetof(struct rte_mbuf, buf_iova));
+   mbuf1 = (uint64_t *)((uintptr_t)mbuf1 +
+offsetof(struct rte_mbuf, buf_iova));
+   mbuf2 = (uint64_t *)((uintptr_t)mbuf2 +
+offsetof(struct rte_mbuf, buf_iova));
+   mbuf3 = (uint64_t *)((uintptr_t)mbuf3 +
+offsetof(struct rte_mbuf, buf_iova));
+   /*
+* Get mbuf's, olflags, iova, pktlen, dataoff
+* dataoff_iovaX.D[0] = iova,
+* dataoff_iovaX.D[1](15:0) = mbuf->dataoff
+* len_olflagsX.D[0] = ol_flags,
+* len_olflagsX.D[1](63:32) = mbuf->pkt_len
+*/
+   dataoff_iova0  = vld1q_u64(mbuf0);
+   len_olflags0 = vld1q_u64(mbuf0 + 2);
+   dataoff_iova1  = vld1q_u64(mbuf1);
+   len_olflags1 = vld1q_u64(mbuf1 + 2);
+   dataoff_iova2  = vld1q_u64(mbuf2);
+   len_olflags2 = vld1q_u64(mbuf2 + 2);
+   dataoff_iova3  = vld1q_u64(mbuf3);
+   len_olflags3 = vld1q_u64(mbuf3 + 2);
+
+   if (flags & NIX_TX_OFFLOAD_MBUF_NOFF_F) {
+   struct rte_mbuf *mbuf;
+   /* Set don't free bit if reference count > 1 */
+   xmask01 = vdupq_n_u64(0);
+   xmask23 = xmask01;
+
+   mbuf = (struct rte_mbuf *)((uintptr_t)mbuf0 -
+   offsetof(struct rte_mbuf, buf_iova));
+
+   if (rte_pktmbuf_prefree_seg(mbuf) == NULL)
+   vsetq_lane_u64(0x8, xmask01, 0);
+   else
+   __mempool_check_cookies(mbuf->pool,
+  

[dpdk-dev] [PATCH v2 55/57] net/octeontx2: add device stop and close operations

[jerinj]

From: Nithin Dabilpuram 

Add device stop, close and reset operations.

Signed-off-by: Nithin Dabilpuram 
Signed-off-by: Vamsi Attunuru 
---
 drivers/net/octeontx2/otx2_ethdev.c | 75 +
 1 file changed, 75 insertions(+)

diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 7f33f8808..e23bed603 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -184,6 +184,19 @@ cgx_intlbk_enable(struct otx2_eth_dev *dev, bool en)
return otx2_mbox_process(mbox);
 }
 
+static int
+nix_cgx_stop_link_event(struct otx2_eth_dev *dev)
+{
+   struct otx2_mbox *mbox = dev->mbox;
+
+   if (otx2_dev_is_vf(dev))
+   return 0;
+
+   otx2_mbox_alloc_msg_cgx_stop_linkevents(mbox);
+
+   return otx2_mbox_process(mbox);
+}
+
 static inline void
 nix_rx_queue_reset(struct otx2_eth_rxq *rxq)
 {
@@ -1189,6 +1202,7 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
if (dev->configured == 1) {
otx2_nix_rxchan_bpid_cfg(eth_dev, false);
otx2_nix_vlan_fini(eth_dev);
+   otx2_flow_free_all_resources(dev);
oxt2_nix_unregister_queue_irqs(eth_dev);
nix_set_nop_rxtx_function(eth_dev);
rc = nix_store_queue_cfg_and_then_release(eth_dev);
@@ -1406,6 +1420,37 @@ otx2_nix_rx_queue_stop(struct rte_eth_dev *eth_dev, 
uint16_t qidx)
return rc;
 }
 
+static void
+otx2_nix_dev_stop(struct rte_eth_dev *eth_dev)
+{
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+   struct rte_mbuf *rx_pkts[32];
+   struct otx2_eth_rxq *rxq;
+   int count, i, j, rc;
+
+   nix_cgx_stop_link_event(dev);
+   npc_rx_disable(dev);
+
+   /* Stop rx queues and free up pkts pending */
+   for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
+   rc = otx2_nix_rx_queue_stop(eth_dev, i);
+   if (rc)
+   continue;
+
+   rxq = eth_dev->data->rx_queues[i];
+   count = dev->rx_pkt_burst_no_offload(rxq, rx_pkts, 32);
+   while (count) {
+   for (j = 0; j < count; j++)
+   rte_pktmbuf_free(rx_pkts[j]);
+   count = dev->rx_pkt_burst_no_offload(rxq, rx_pkts, 32);
+   }
+   }
+
+   /* Stop tx queues  */
+   for (i = 0; i < eth_dev->data->nb_tx_queues; i++)
+   otx2_nix_tx_queue_stop(eth_dev, i);
+}
+
 static int
 otx2_nix_dev_start(struct rte_eth_dev *eth_dev)
 {
@@ -1458,6 +1503,8 @@ otx2_nix_dev_start(struct rte_eth_dev *eth_dev)
return rc;
 }
 
+static int otx2_nix_dev_reset(struct rte_eth_dev *eth_dev);
+static void otx2_nix_dev_close(struct rte_eth_dev *eth_dev);
 
 /* Initialize and register driver with DPDK Application */
 static const struct eth_dev_ops otx2_eth_dev_ops = {
@@ -1469,11 +1516,14 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.rx_queue_setup   = otx2_nix_rx_queue_setup,
.rx_queue_release = otx2_nix_rx_queue_release,
.dev_start= otx2_nix_dev_start,
+   .dev_stop = otx2_nix_dev_stop,
+   .dev_close= otx2_nix_dev_close,
.tx_queue_start   = otx2_nix_tx_queue_start,
.tx_queue_stop= otx2_nix_tx_queue_stop,
.rx_queue_start   = otx2_nix_rx_queue_start,
.rx_queue_stop= otx2_nix_rx_queue_stop,
.dev_supported_ptypes_get = otx2_nix_supported_ptypes_get,
+   .dev_reset= otx2_nix_dev_reset,
.stats_get= otx2_nix_dev_stats_get,
.stats_reset  = otx2_nix_dev_stats_reset,
.get_reg  = otx2_nix_dev_get_reg,
@@ -1725,9 +1775,14 @@ otx2_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool 
mbox_close)
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;
 
+   /* Clear the flag since we are closing down */
+   dev->configured = 0;
+
/* Disable nix bpid config */
otx2_nix_rxchan_bpid_cfg(eth_dev, false);
 
+   npc_rx_disable(dev);
+
/* Disable vlan offloads */
otx2_nix_vlan_fini(eth_dev);
 
@@ -1738,6 +1793,8 @@ otx2_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool 
mbox_close)
if (otx2_ethdev_is_ptp_en(dev))
otx2_nix_timesync_disable(eth_dev);
 
+   nix_cgx_stop_link_event(dev);
+
/* Free up SQs */
for (i = 0; i < eth_dev->data->nb_tx_queues; i++) {
otx2_nix_tx_queue_release(eth_dev->data->tx_queues[i]);
@@ -1793,6 +1850,24 @@ otx2_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool 
mbox_close)
return 0;
 }
 
+static void
+otx2_nix_dev_close(struct rte_eth_dev *eth_dev)
+{
+   otx2_eth_dev_uninit(eth_dev, true);
+}
+
+static int
+otx2_nix_dev_reset(struct rte_eth_dev *eth_dev)
+{
+   int rc;
+
+   rc = otx2_et

[dpdk-dev] [PATCH v2 57/57] net/octeontx2: add Rx interrupts support

[jerinj]

From: Harman Kalra 

This patch implements rx interrupts feature required for power
saving. These interrupts can be enabled/disabled on demand.

Signed-off-by: Harman Kalra 
---
 doc/guides/nics/features/octeontx2.ini|   1 +
 doc/guides/nics/features/octeontx2_vf.ini |   1 +
 doc/guides/nics/octeontx2.rst |   1 +
 drivers/net/octeontx2/otx2_ethdev.c   |  31 ++
 drivers/net/octeontx2/otx2_ethdev.h   |  16 +++
 drivers/net/octeontx2/otx2_ethdev_irq.c   | 125 ++
 6 files changed, 175 insertions(+)

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index be10dc0c8..66952328b 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -5,6 +5,7 @@
 ;
 [Features]
 Speed capabilities   = Y
+Rx interrupt = Y
 Lock-free Tx queue   = Y
 SR-IOV   = Y
 Multiprocess aware   = Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
index bef451d01..16799309b 100644
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -7,6 +7,7 @@
 Speed capabilities   = Y
 Lock-free Tx queue   = Y
 Multiprocess aware   = Y
+Rx interrupt = Y
 Link status  = Y
 Link status event= Y
 Runtime Rx queue setup = Y
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index 517e9e641..dbd376665 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -36,6 +36,7 @@ Features of the OCTEON TX2 Ethdev PMD are:
 - Debug utilities - Context dump and error interrupt support
 - IEEE1588 timestamping
 - HW offloaded `ethdev Rx queue` to `eventdev event queue` packet injection
+- Support Rx interrupt
 
 Prerequisites
 -
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 170593e95..7f50a4c0e 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -277,6 +277,8 @@ nix_cq_rq_init(struct rte_eth_dev *eth_dev, struct 
otx2_eth_dev *dev,
 
/* Many to one reduction */
aq->cq.qint_idx = qid % dev->qints;
+   /* Map CQ0 [RQ0] to CINT0 and so on till max 64 irqs */
+   aq->cq.cint_idx = qid;
 
if (otx2_ethdev_fixup_is_limit_cq_full(dev)) {
uint16_t min_rx_drop;
@@ -1204,6 +1206,8 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
otx2_nix_vlan_fini(eth_dev);
otx2_flow_free_all_resources(dev);
oxt2_nix_unregister_queue_irqs(eth_dev);
+   if (eth_dev->data->dev_conf.intr_conf.rxq)
+   oxt2_nix_unregister_cq_irqs(eth_dev);
nix_set_nop_rxtx_function(eth_dev);
rc = nix_store_queue_cfg_and_then_release(eth_dev);
if (rc)
@@ -1264,6 +1268,27 @@ otx2_nix_configure(struct rte_eth_dev *eth_dev)
goto free_nix_lf;
}
 
+   /* Register cq IRQs */
+   if (eth_dev->data->dev_conf.intr_conf.rxq) {
+   if (eth_dev->data->nb_rx_queues > dev->cints) {
+   otx2_err("Rx interrupt cannot be enabled, rxq > %d",
+dev->cints);
+   goto free_nix_lf;
+   }
+   /* Rx interrupt feature cannot work with vector mode because,
+* vector mode doesn't process packets unless min 4 pkts are
+* received, while cq interrupts are generated even for 1 pkt
+* in the CQ.
+*/
+   dev->scalar_ena = true;
+
+   rc = oxt2_nix_register_cq_irqs(eth_dev);
+   if (rc) {
+   otx2_err("Failed to register CQ interrupts rc=%d", rc);
+   goto free_nix_lf;
+   }
+   }
+
/* Configure loop back mode */
rc = cgx_intlbk_enable(dev, eth_dev->data->dev_conf.lpbk_mode);
if (rc) {
@@ -1576,6 +1601,8 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.vlan_strip_queue_set = otx2_nix_vlan_strip_queue_set,
.vlan_tpid_set= otx2_nix_vlan_tpid_set,
.vlan_pvid_set= otx2_nix_vlan_pvid_set,
+   .rx_queue_intr_enable = otx2_nix_rx_queue_intr_enable,
+   .rx_queue_intr_disable= otx2_nix_rx_queue_intr_disable,
 };
 
 static inline int
@@ -1824,6 +1851,10 @@ otx2_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool 
mbox_close)
/* Unregister queue irqs */
oxt2_nix_unregister_queue_irqs(eth_dev);
 
+   /* Unregister cq irqs */
+   if (eth_dev->data->dev_conf.intr_conf.rxq)
+   oxt2_nix_unregister_cq_irqs(eth_dev);
+
rc = nix_lf_free(dev);
if (rc)
otx2_err("Failed to free nix lf, rc=%d", rc);
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 3703acc69..f6905db83 100644
--- a/drivers/n

[dpdk-dev] [PATCH v2 51/57] net/octeontx2: add Tx burst support

[jerinj]

From: Jerin Jacob 

Add Tx burst support.

Signed-off-by: Jerin Jacob 
Signed-off-by: Nithin Dabilpuram 
Signed-off-by: Pavan Nikhilesh 
Signed-off-by: Harman Kalra 
---
 doc/guides/nics/features/octeontx2.ini |   5 +
 doc/guides/nics/features/octeontx2_vec.ini |   5 +
 doc/guides/nics/features/octeontx2_vf.ini  |   5 +
 doc/guides/nics/octeontx2.rst  |   1 +
 drivers/net/octeontx2/Makefile |   1 +
 drivers/net/octeontx2/meson.build  |   1 +
 drivers/net/octeontx2/otx2_ethdev.c|   6 -
 drivers/net/octeontx2/otx2_ethdev.h|   1 +
 drivers/net/octeontx2/otx2_tx.c|  94 
 drivers/net/octeontx2/otx2_tx.h| 261 +
 10 files changed, 374 insertions(+), 6 deletions(-)
 create mode 100644 drivers/net/octeontx2/otx2_tx.c

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index 3280cba78..1856d9924 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -12,6 +12,7 @@ Link status  = Y
 Link status event= Y
 Runtime Rx queue setup = Y
 Runtime Tx queue setup = Y
+Fast mbuf free   = Y
 Free Tx mbuf on demand = Y
 Queue start/stop = Y
 Promiscuous mode = Y
@@ -28,6 +29,10 @@ Jumbo frame  = Y
 Scattered Rx = Y
 VLAN offload = Y
 QinQ offload = Y
+L3 checksum offload  = Y
+L4 checksum offload  = Y
+Inner L3 checksum= Y
+Inner L4 checksum= Y
 Packet type parsing  = Y
 Timesync = Y
 Timestamp offload= Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index 315722e60..053fca288 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -12,6 +12,7 @@ Link status  = Y
 Link status event= Y
 Runtime Rx queue setup = Y
 Runtime Tx queue setup = Y
+Fast mbuf free   = Y
 Free Tx mbuf on demand = Y
 Queue start/stop = Y
 Promiscuous mode = Y
@@ -27,6 +28,10 @@ Flow API = Y
 Jumbo frame  = Y
 VLAN offload = Y
 QinQ offload = Y
+L3 checksum offload  = Y
+L4 checksum offload  = Y
+Inner L3 checksum= Y
+Inner L4 checksum= Y
 Packet type parsing  = Y
 Rx descriptor status = Y
 Basic stats  = Y
diff --git a/doc/guides/nics/features/octeontx2_vf.ini 
b/doc/guides/nics/features/octeontx2_vf.ini
index 17b223221..bef451d01 100644
--- a/doc/guides/nics/features/octeontx2_vf.ini
+++ b/doc/guides/nics/features/octeontx2_vf.ini
@@ -11,6 +11,7 @@ Link status  = Y
 Link status event= Y
 Runtime Rx queue setup = Y
 Runtime Tx queue setup = Y
+Fast mbuf free   = Y
 Free Tx mbuf on demand = Y
 Queue start/stop = Y
 RSS hash = Y
@@ -23,6 +24,10 @@ Jumbo frame  = Y
 Scattered Rx = Y
 VLAN offload = Y
 QinQ offload = Y
+L3 checksum offload  = Y
+L4 checksum offload  = Y
+Inner L3 checksum= Y
+Inner L4 checksum= Y
 Packet type parsing  = Y
 Rx descriptor status = Y
 Basic stats  = Y
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index 9d6596ad8..90ca4e2d2 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -25,6 +25,7 @@ Features of the OCTEON TX2 Ethdev PMD are:
 - Receiver Side Scaling (RSS)
 - MAC/VLAN filtering
 - Generic flow API
+- Inner and Outer Checksum offload
 - VLAN/QinQ stripping and insertion
 - Port hardware statistics
 - Link state information
diff --git a/drivers/net/octeontx2/Makefile b/drivers/net/octeontx2/Makefile
index a5f125655..c187d2555 100644
--- a/drivers/net/octeontx2/Makefile
+++ b/drivers/net/octeontx2/Makefile
@@ -30,6 +30,7 @@ LIBABIVER := 1
 #
 SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_PMD) += \
otx2_rx.c   \
+   otx2_tx.c   \
otx2_tm.c   \
otx2_rss.c  \
otx2_mac.c  \
diff --git a/drivers/net/octeontx2/meson.build 
b/drivers/net/octeontx2/meson.build
index 9d151f88d..94bf09a78 100644
--- a/drivers/net/octeontx2/meson.build
+++ b/drivers/net/octeontx2/meson.build
@@ -3,6 +3,7 @@
 #
 
 sources = files('otx2_rx.c',
+   'otx2_tx.c',
'otx2_tm.c',
'otx2_rss.c',
'otx2_mac.c',
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index 1f8a22300..44753cbf5 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -14,12 +14,6 @@
 
 #include "otx2_ethdev.h"
 
-static inline void
-otx2_eth_set_tx_function(struct rte_eth_dev *eth_dev)
-{
-   RTE_SET_USED(eth_dev);
-}
-
 static inline uint64_t
 nix_get_rx_offload_capa(struct otx2_eth_dev *dev)
 {
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 22cf86981..1f9323fe3 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -484,6 +484,7 @@ int otx2_e

[dpdk-dev] [PATCH v2 56/57] net/octeontx2: add MTU set operation

[jerinj]

From: Vamsi Attunuru 

Add MTU set operation and MTU update feature.

Signed-off-by: Vamsi Attunuru 
Signed-off-by: Sunil Kumar Kori 
---
 doc/guides/nics/features/octeontx2.ini |  1 +
 doc/guides/nics/features/octeontx2_vec.ini |  1 +
 doc/guides/nics/octeontx2.rst  |  1 +
 drivers/net/octeontx2/otx2_ethdev.c|  7 ++
 drivers/net/octeontx2/otx2_ethdev.h|  4 +
 drivers/net/octeontx2/otx2_ethdev_ops.c| 86 ++
 6 files changed, 100 insertions(+)

diff --git a/doc/guides/nics/features/octeontx2.ini 
b/doc/guides/nics/features/octeontx2.ini
index 1856d9924..be10dc0c8 100644
--- a/doc/guides/nics/features/octeontx2.ini
+++ b/doc/guides/nics/features/octeontx2.ini
@@ -15,6 +15,7 @@ Runtime Tx queue setup = Y
 Fast mbuf free   = Y
 Free Tx mbuf on demand = Y
 Queue start/stop = Y
+MTU update   = Y
 Promiscuous mode = Y
 Allmulticast mode= Y
 Unicast MAC filter   = Y
diff --git a/doc/guides/nics/features/octeontx2_vec.ini 
b/doc/guides/nics/features/octeontx2_vec.ini
index 053fca288..df8180f83 100644
--- a/doc/guides/nics/features/octeontx2_vec.ini
+++ b/doc/guides/nics/features/octeontx2_vec.ini
@@ -15,6 +15,7 @@ Runtime Tx queue setup = Y
 Fast mbuf free   = Y
 Free Tx mbuf on demand = Y
 Queue start/stop = Y
+MTU update   = Y
 Promiscuous mode = Y
 Allmulticast mode= Y
 Unicast MAC filter   = Y
diff --git a/doc/guides/nics/octeontx2.rst b/doc/guides/nics/octeontx2.rst
index d4a458262..517e9e641 100644
--- a/doc/guides/nics/octeontx2.rst
+++ b/doc/guides/nics/octeontx2.rst
@@ -30,6 +30,7 @@ Features of the OCTEON TX2 Ethdev PMD are:
 - Port hardware statistics
 - Link state information
 - Link flow control
+- MTU update
 - Scatter-Gather IO support
 - Vector Poll mode driver
 - Debug utilities - Context dump and error interrupt support
diff --git a/drivers/net/octeontx2/otx2_ethdev.c 
b/drivers/net/octeontx2/otx2_ethdev.c
index e23bed603..170593e95 100644
--- a/drivers/net/octeontx2/otx2_ethdev.c
+++ b/drivers/net/octeontx2/otx2_ethdev.c
@@ -1457,6 +1457,12 @@ otx2_nix_dev_start(struct rte_eth_dev *eth_dev)
struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
int rc, i;
 
+   if (eth_dev->data->nb_rx_queues != 0) {
+   rc = otx2_nix_recalc_mtu(eth_dev);
+   if (rc)
+   return rc;
+   }
+
/* Start rx queues */
for (i = 0; i < eth_dev->data->nb_rx_queues; i++) {
rc = otx2_nix_rx_queue_start(eth_dev, i);
@@ -1527,6 +1533,7 @@ static const struct eth_dev_ops otx2_eth_dev_ops = {
.stats_get= otx2_nix_dev_stats_get,
.stats_reset  = otx2_nix_dev_stats_reset,
.get_reg  = otx2_nix_dev_get_reg,
+   .mtu_set  = otx2_nix_mtu_set,
.mac_addr_add = otx2_nix_mac_addr_add,
.mac_addr_remove  = otx2_nix_mac_addr_del,
.mac_addr_set = otx2_nix_mac_addr_set,
diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index f39fdfa1f..3703acc69 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -371,6 +371,10 @@ int otx2_nix_tx_queue_start(struct rte_eth_dev *eth_dev, 
uint16_t qidx);
 int otx2_nix_tx_queue_stop(struct rte_eth_dev *eth_dev, uint16_t qidx);
 uint64_t otx2_nix_rxq_mbuf_setup(struct otx2_eth_dev *dev, uint16_t port_id);
 
+/* MTU */
+int otx2_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu);
+int otx2_nix_recalc_mtu(struct rte_eth_dev *eth_dev);
+
 /* Link */
 void otx2_nix_toggle_flag_link_cfg(struct otx2_eth_dev *dev, bool set);
 int otx2_nix_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete);
diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c 
b/drivers/net/octeontx2/otx2_ethdev_ops.c
index 6a3048336..5a16a3c04 100644
--- a/drivers/net/octeontx2/otx2_ethdev_ops.c
+++ b/drivers/net/octeontx2/otx2_ethdev_ops.c
@@ -6,6 +6,92 @@
 
 #include "otx2_ethdev.h"
 
+int
+otx2_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
+{
+   uint32_t buffsz, frame_size = mtu + NIX_L2_OVERHEAD;
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+   struct rte_eth_dev_data *data = eth_dev->data;
+   struct otx2_mbox *mbox = dev->mbox;
+   struct nix_frs_cfg *req;
+   int rc;
+
+   /* Check if MTU is within the allowed range */
+   if (frame_size < NIX_MIN_FRS || frame_size > NIX_MAX_FRS)
+   return -EINVAL;
+
+   buffsz = data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM;
+
+   /* Refuse MTU that requires the support of scattered packets
+* when this feature has not been enabled before.
+*/
+   if (data->dev_started && frame_size > buffsz &&
+   !(dev->rx_offloads & DEV_RX_OFFLOAD_SCATTER))
+   return -EINVAL;
+
+   /* Check  *   >= max_frame */
+   if ((dev->rx_offloads & DEV_RX_OFFLOAD_SCATTER) &&
+   

[dpdk-dev] [PATCH v2 52/57] net/octeontx2: add Tx multi segment version

[jerinj]

From: Nithin Dabilpuram 

Add multi segment version of packet Transmit function.

Signed-off-by: Nithin Dabilpuram 
Signed-off-by: Pavan Nikhilesh 
---
 drivers/net/octeontx2/otx2_ethdev.h |  4 ++
 drivers/net/octeontx2/otx2_tx.c | 58 +
 drivers/net/octeontx2/otx2_tx.h | 81 +
 3 files changed, 143 insertions(+)

diff --git a/drivers/net/octeontx2/otx2_ethdev.h 
b/drivers/net/octeontx2/otx2_ethdev.h
index 1f9323fe3..f39fdfa1f 100644
--- a/drivers/net/octeontx2/otx2_ethdev.h
+++ b/drivers/net/octeontx2/otx2_ethdev.h
@@ -89,6 +89,10 @@
 #define NIX_TX_NB_SEG_MAX  9
 #endif
 
+#define NIX_TX_MSEG_SG_DWORDS  \
+   ((RTE_ALIGN_MUL_CEIL(NIX_TX_NB_SEG_MAX, 3) / 3) \
++ NIX_TX_NB_SEG_MAX)
+
 /* Apply BP when CQ is 75% full */
 #define NIX_CQ_BP_LEVEL (25 * 256 / 100)
 
diff --git a/drivers/net/octeontx2/otx2_tx.c b/drivers/net/octeontx2/otx2_tx.c
index 16d69b74f..0ac5ea652 100644
--- a/drivers/net/octeontx2/otx2_tx.c
+++ b/drivers/net/octeontx2/otx2_tx.c
@@ -49,6 +49,37 @@ nix_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,
return pkts;
 }
 
+static __rte_always_inline uint16_t
+nix_xmit_pkts_mseg(void *tx_queue, struct rte_mbuf **tx_pkts,
+  uint16_t pkts, uint64_t *cmd, const uint16_t flags)
+{
+   struct otx2_eth_txq *txq = tx_queue; uint64_t i;
+   const rte_iova_t io_addr = txq->io_addr;
+   void *lmt_addr = txq->lmt_addr;
+   uint16_t segdw;
+
+   NIX_XMIT_FC_OR_RETURN(txq, pkts);
+
+   otx2_lmt_mov(cmd, &txq->cmd[0], otx2_nix_tx_ext_subs(flags));
+
+   /* Lets commit any changes in the packet */
+   rte_cio_wmb();
+
+   for (i = 0; i < pkts; i++) {
+   otx2_nix_xmit_prepare(tx_pkts[i], cmd, flags);
+   segdw = otx2_nix_prepare_mseg(tx_pkts[i], cmd, flags);
+   otx2_nix_xmit_prepare_tstamp(cmd, &txq->cmd[0],
+tx_pkts[i]->ol_flags, segdw,
+flags);
+   otx2_nix_xmit_mseg_one(cmd, lmt_addr, io_addr, segdw);
+   }
+
+   /* Reduce the cached count */
+   txq->fc_cache_pkts -= pkts;
+
+   return pkts;
+}
+
 #define T(name, f4, f3, f2, f1, f0, sz, flags) \
 static uint16_t __rte_noinline __hot   \
 otx2_nix_xmit_pkts_ ## name(void *tx_queue,\
@@ -62,6 +93,20 @@ otx2_nix_xmit_pkts_ ## name(void *tx_queue,  
\
 NIX_TX_FASTPATH_MODES
 #undef T
 
+#define T(name, f4, f3, f2, f1, f0, sz, flags) \
+static uint16_t __rte_noinline __hot   \
+otx2_nix_xmit_pkts_mseg_ ## name(void *tx_queue,   \
+   struct rte_mbuf **tx_pkts, uint16_t pkts)   \
+{  \
+   uint64_t cmd[(sz) + NIX_TX_MSEG_SG_DWORDS - 2]; \
+   \
+   return nix_xmit_pkts_mseg(tx_queue, tx_pkts, pkts, cmd, \
+ (flags) | NIX_TX_MULTI_SEG_F);\
+}
+
+NIX_TX_FASTPATH_MODES
+#undef T
+
 static inline void
 pick_tx_func(struct rte_eth_dev *eth_dev,
 const eth_tx_burst_t tx_burst[2][2][2][2][2])
@@ -80,15 +125,28 @@ pick_tx_func(struct rte_eth_dev *eth_dev,
 void
 otx2_eth_set_tx_function(struct rte_eth_dev *eth_dev)
 {
+   struct otx2_eth_dev *dev = otx2_eth_pmd_priv(eth_dev);
+
const eth_tx_burst_t nix_eth_tx_burst[2][2][2][2][2] = {
 #define T(name, f4, f3, f2, f1, f0, sz, flags) \
[f4][f3][f2][f1][f0] =  otx2_nix_xmit_pkts_ ## name,
 
+NIX_TX_FASTPATH_MODES
+#undef T
+   };
+
+   const eth_tx_burst_t nix_eth_tx_burst_mseg[2][2][2][2][2] = {
+#define T(name, f4, f3, f2, f1, f0, sz, flags) \
+   [f4][f3][f2][f1][f0] =  otx2_nix_xmit_pkts_mseg_ ## name,
+
 NIX_TX_FASTPATH_MODES
 #undef T
};
 
pick_tx_func(eth_dev, nix_eth_tx_burst);
 
+   if (dev->tx_offloads & DEV_TX_OFFLOAD_MULTI_SEGS)
+   pick_tx_func(eth_dev, nix_eth_tx_burst_mseg);
+
rte_mb();
 }
diff --git a/drivers/net/octeontx2/otx2_tx.h b/drivers/net/octeontx2/otx2_tx.h
index db4c1f70f..b75a220ea 100644
--- a/drivers/net/octeontx2/otx2_tx.h
+++ b/drivers/net/octeontx2/otx2_tx.h
@@ -212,6 +212,87 @@ otx2_nix_xmit_one(uint64_t *cmd, void *lmt_addr,
} while (lmt_status == 0);
 }
 
+static __rte_always_inline uint16_t
+otx2_nix_prepare_mseg(struct rte_mbuf *m, uint64_t *cmd, const uint16_t flags)
+{
+   struct nix_send_hdr_s *send_hdr;
+   union nix_send_sg_s *sg;
+   struct rte_mbuf *m_next;
+   uint64_t *slist, sg_u;
+   uint64_t nb_segs;
+   uint64_t segdw;
+   uint8_t off, i;
+
+   send_hdr = (struct nix_send_hdr_s *)cm

Re: [dpdk-dev] [RFC 1/5] eal: add the APIs to wait until equal

[Stephen Hemminger]

On Mon,  1 Jul 2019 00:21:12 +0800
Gavin Hu  wrote:

> +#ifdef RTE_USE_WFE
> +#define rte_wait_until_equal_relaxed(addr, expected) do {\
> + typeof(*addr) tmp;  \
> + if (__builtin_constant_p((expected))) \
> + do { \
> + if (sizeof(*(addr)) == 16)\
> + asm volatile(  \
> + "sevl\n"  \
> + "1:  wfe\n"  \
> + "ldxrh  %w0, %1\n"  \
> + "cmp%w0, %w2\n"  \
> + "bne1b\n"  \
> + : "=&r"(tmp)  \
> + : "Q"(*addr), "i"(expected)  \
> + : "cc", "memory");  \
> + else if (sizeof(*(addr)) == 32)\
> + asm volatile(  \
> + "sevl\n"  \
> + "1:  wfe\n"  \
> + "ldxr  %w0, %1\n"  \
> + "cmp%w0, %w2\n"  \
> + "bne1b\n"  \
> + : "=&r"(tmp)  \
> + : "Q"(*addr), "i"(expected)  \
> + : "cc", "memory");  \
> + else if (sizeof(*(addr)) == 64)\
> + asm volatile(  \
> + "sevl\n"  \
> + "1:  wfe\n"  \
> + "ldxr  %x0, %1\n"  \
> + "cmp%x0, %x2\n"  \
> + "bne1b\n"  \
> + : "=&r" (tmp)  \
> + : "Q"(*addr), "i"(expected)  \
> + : "cc", "memory"); \
> + } while (0); \
> + else \
> + do { \
> + if (sizeof(*(addr)) == 16)\
> + asm volatile(  \
> + "sevl\n"  \
> + "1:  wfe\n"  \
> + "ldxrh  %w0, %1\n"  \
> + "cmp%w0, %w2\n"  \
> + "bne1b\n"  \
> + : "=&r"(tmp)  \
> + : "Q"(*addr), "r"(expected)  \
> + : "cc", "memory");  \
> + else if (sizeof(*(addr)) == 32)\
> + asm volatile(  \
> + "sevl\n"  \
> + "1:  wfe\n"  \
> + "ldxr  %w0, %1\n"  \
> + "cmp%w0, %w2\n"  \
> + "bne1b\n"  \
> + : "=&r"(tmp)  \
> + : "Q"(*addr), "r"(expected)  \
> + : "cc", "memory");  \
> + else if (sizeof(*(addr)) == 64)\
> + asm volatile(  \
> + "sevl\n"  \
> + "1:  wfe\n"  \
> + "ldxr  %x0, %1\n"  \
> + "cmp%x0, %x2\n"  \
> + "bne1b\n"  \
> + : "=&r" (tmp)  \
> + : "Q"(*addr), "r"(expected)  \
> + : "cc", "memory");  \
> + } while (0); \
> +} while (0)

That is a hot mess.
Macro's are harder to maintain and offer no benefit over inline functions.

Re: [dpdk-dev] [RFC 0/5] use WFE for locks and ring on aarch64

[Stephen Hemminger]

On Mon,  1 Jul 2019 00:21:11 +0800
Gavin Hu  wrote:

> DPDK has multiple use cases where the core repeatedly polls a location in
> memory. This polling results in many cache and memory transactions.
> 
> Arm architecture provides WFE (Wait For Event) instruction, which allows
> the cpu core to enter a low power state until woken up by the update to the
> memory location being polled. Thus reducing the cache and memory
> transactions.
> 
> x86 has the PAUSE hint instruction to reduce such overhead.
> 
> The rte_wait_until_equal_xxx APIs abstract the functionality of 'polling
> for a memory location to become equal to a given value'.
> 
> For non-Arm platforms, these APIs are just wrappers around do-while loop
> with rte_pause, so there are no performance differences.
> 
> For Arm platforms, use of WFE can be configured using CONFIG_RTE_USE_WFE
> option. It is disabled by default.
> 
> Currently, use of WFE is supported only for aarch64 platforms. armv7
> platforms do support the WFE instruction, but they require explicit wake up
> events(sev) and are less performannt.
> 
> Testing shows that, performance varies across different platforms, with
> some showing degradation.
> 
> CONFIG_RTE_USE_WFE should be enabled depending on the performance on the
> target platforms.

How does this work if process is preempted?

Re: [dpdk-dev] [EXT] [PATCH v4 3/6] app/test-compress-perf: add verification test case

[Tomasz Jozwiak]

Hi Shally,

Thx for the review.

My comments below:




-Original Message-
From: Tomasz Jozwiak 
Sent: Friday, June 28, 2019 3:56 AM
To: dev@dpdk.org; fiona.tr...@intel.com; tjozwia...@gmail.com; Shally
Verma ; arturx.tryb...@intel.com
Subject: [EXT] [PATCH v4 3/6] app/test-compress-perf: add verification test
case

External Email

--
From: Tomasz Jozwiak 

...


diff --git a/app/test-compress-perf/comp_perf_test_verify.c b/app/test-
compress-perf/comp_perf_test_verify.c
index 28a0fe8..c2aab70 100644
--- a/app/test-compress-perf/comp_perf_test_verify.c
+++ b/app/test-compress-perf/comp_perf_test_verify.c
@@ -8,14 +8,48 @@
  #include 

  #include "comp_perf_test_verify.h"
+#include "comp_perf_test_common.h"
+
+void
+cperf_verify_test_destructor(void *arg) {
+   if (arg) {
+   comp_perf_free_memory(&((struct cperf_verify_ctx *)arg)-

mem);

+   rte_free(arg);
+   }
+}
+
+void *
+cperf_verify_test_constructor(uint8_t dev_id, uint16_t qp_id,
+   struct comp_test_data *options)
+{
+   struct cperf_verify_ctx *ctx = NULL;
+
+   ctx = rte_malloc(NULL, sizeof(struct cperf_verify_ctx), 0);
+

Better just return from here


[Tomek]. Yes you right. we wasn't able to allocate 'cperf_verify_ctx 
struct',


so we don't need to call destructor here. I assume there's the same issue

in benchmark patch - will align both in V5. Thx.





+   if (ctx != NULL) {
+   ctx->mem.dev_id = dev_id;
+   ctx->mem.qp_id = qp_id;
+   ctx->options = options;
+
+   if (!comp_perf_allocate_memory(ctx->options, &ctx->mem)
&&
+   !prepare_bufs(ctx->options, &ctx->mem))
+   return ctx;

What if condition fails on comp_per_allocate_memory(), then it will go to 
verify_test_destructor(), so comp_perf_free_memory() check if mem != NULL 
before calling actual free?


[Tomek] I mean it's ok. Please take in to account that we was able to 
allocate 'cperf_verify_ctx struct' - cause


ctx != NULL here. that means 'mem struct' inside 'cperf_verify_ctx 
struct' exists for sure:


struct cperf_verify_ctx {
*struct cperf_mem_resources mem;*
    struct comp_test_data *options;

    int silent;
    size_t comp_data_sz;
    size_t decomp_data_sz;
    double ratio;
};

and all fields inside 'struct cperf_mem_resources mem' are zeroed.

We don't need to check mem != NULL before free, because in this place 
mem != NULL for sure. Also it's ok to call 'rte_free',


'rte_mempool_free' and 'rte_pktmbuf_free' with NULL ptr.

as a argument because the check is inside all of these functions.




Thx for the comments.


--

Tomek

Re: [dpdk-dev] [dpdk-stable] [PATCH v3] app/testpmd: remove port stop check for macsec

[Thomas Monjalon]

27/06/2019 19:23, Ferruh Yigit:
> On 6/10/2019 7:07 AM, Wei Zhao wrote:
> > There is no need to do such a check when set macsec for ixgbe, and
> > reconfig_device_queueand is also useless. If we do not delete this
> > unnessary code, users have to stop port before enable or disable
> > macsec, then restart this port after make configuration. All these
> > process are useless. As this cmdline is a private API which is only
> > used by ixgbe NIC, so remove it.
> > 
> > Fixes: 597f9fafe13b ("app/testpmd: convert to new Tx offloads API")
> > Cc: sta...@dpdk.org
> > 
> > Signed-off-by: Wei Zhao 
> > Tested-by: Peng Yuan 
> > Acked-by: Bernard Iremonger 
> 
> Applied to dpdk-next-net/master, thanks.

I disagree with the purpose of this patch.
It is removing some "generic" code with the argument that it is
not needed in the case of ixgbe, and ixgbe is the only user.
We may (and probably will) have other PMDs using this command,
so the argument is not OK.

I do not merge this patch in master for now.
Sorry for the inconvenience.

Re: [dpdk-dev] [PATCH v4 01/10] baseband/turbo_sw: baseband/turbo_sw: dependency patch

[Mokhtar, Amr]

> -Original Message-
> From: Chautru, Nicolas
> Sent: Monday 24 June 2019 03:53
> To: akhil.go...@nxp.com; dev@dpdk.org
> Cc: tho...@monjalon.net; Yigit, Ferruh ;
> Mokhtar, Amr ; Chautru, Nicolas
> 
> Subject: [PATCH v4 01/10] baseband/turbo_sw: baseband/turbo_sw:
> dependency patch
> 
> Not meant for review, purely for dependency for CI.
> This is a squash of the related serie which
> is not applied yet:
> option to build turbosw PMD without SDK
> https://patches.dpdk.org/project/dpdk/list/?series=5093
> 
> Signed-off-by: Nicolas Chautru 
> ---

Acked-by: Amr Mokhtar 

Re: [dpdk-dev] [PATCH v4 02/10] baseband/fpga_lte_fec: dependency patch

[Mokhtar, Amr]

> -Original Message-
> From: Chautru, Nicolas
> Sent: Monday 24 June 2019 03:53
> To: akhil.go...@nxp.com; dev@dpdk.org
> Cc: tho...@monjalon.net; Yigit, Ferruh ;
> Mokhtar, Amr ; Chautru, Nicolas
> 
> Subject: [PATCH v4 02/10] baseband/fpga_lte_fec: dependency patch
> 
> Not meant for review, purely for dependency for CI.
> This is a squash of the related serie which
> is not applied yet:
> adding driver for FEC on FPGA
> https://patches.dpdk.org/project/dpdk/list/?series=5017
> 
> Signed-off-by: Nicolas Chautru 
> ---


> +++ b/doc/guides/bbdevs/fpga_lte_fec.rst
> @@ -0,0 +1,318 @@
> +..  SPDX-License-Identifier: BSD-3-Clause
> +Copyright(c) 2018 Intel Corporation
> +

Should this be copyrighted starting 2019? Note also that I see other
files related to FPGA driver are copyright 2019.

Acked-by: Amr Mokhtar 

Re: [dpdk-dev] [PATCH v4 03/10] bbdev: renaming non-generic LTE specific structure

[Mokhtar, Amr]

> -Original Message-
> From: Chautru, Nicolas
> Sent: Monday 24 June 2019 03:53
> To: akhil.go...@nxp.com; dev@dpdk.org
> Cc: tho...@monjalon.net; Yigit, Ferruh ;
> Mokhtar, Amr ; Chautru, Nicolas
> 
> Subject: [PATCH v4 03/10] bbdev: renaming non-generic LTE specific
> structure
> 
> Renaming of the enums and structure which were LTE specific to
> allow for extension and support for 5GNR operations.
> 
> Signed-off-by: Nicolas Chautru 
> ---

Acked-by: Amr Mokhtar 

Re: [dpdk-dev] [PATCH v4 04/10] bbdev: extension of BBDEV API for 5G FEC

[Mokhtar, Amr]

> -Original Message-
> From: Chautru, Nicolas
> Sent: Monday 24 June 2019 03:53
> To: akhil.go...@nxp.com; dev@dpdk.org
> Cc: tho...@monjalon.net; Yigit, Ferruh ;
> Mokhtar, Amr ; Chautru, Nicolas
> 
> Subject: [PATCH v4 04/10] bbdev: extension of BBDEV API for 5G FEC
> 
> Extension to BBDEV operations to support 5G
> on top of existing 4G operations.
> 
> Signed-off-by: Nicolas Chautru 
> ---

Acked-by: Amr Mokhtar 

Re: [dpdk-dev] [PATCH v4 05/10] docs/guides: updating bbdev API for 5GNR operations

[Mokhtar, Amr]

> -Original Message-
> From: Chautru, Nicolas
> Sent: Monday 24 June 2019 03:53
> To: akhil.go...@nxp.com; dev@dpdk.org
> Cc: tho...@monjalon.net; Yigit, Ferruh ;
> Mokhtar, Amr ; Chautru, Nicolas
> 
> Subject: [PATCH v4 05/10] docs/guides: updating bbdev API for 5GNR
> operations
> 
> The documentation captures the related change in
> BBDEV API to support 5GNR encode/decode operations.
> 
> Signed-off-by: Nicolas Chautru 
> ---

Acked-by: Amr Mokhtar 

Re: [dpdk-dev] [PATCH v4 06/10] baseband/turbo_sw: extension of turbosw PMD for 5G

[Mokhtar, Amr]

> -Original Message-
> From: Chautru, Nicolas
> Sent: Monday 24 June 2019 03:53
> To: akhil.go...@nxp.com; dev@dpdk.org
> Cc: tho...@monjalon.net; Yigit, Ferruh ;
> Mokhtar, Amr ; Chautru, Nicolas
> 
> Subject: [PATCH v4 06/10] baseband/turbo_sw: extension of turbosw PMD
> for 5G
> 
> Implementation still based on Intel SDK libraries
> optimized for AVX512 instructions set and 5GNR.
> This can be also build for AVX2 for 4G capability or
> without SDK dependency for maintenance.
> 
> Signed-off-by: Nicolas Chautru 
> ---

Acked-by: Amr Mokhtar 

Re: [dpdk-dev] [PATCH v4 07/10] docs/guides: updating building steps for BBDEV PMD

[Mokhtar, Amr]

> -Original Message-
> From: Chautru, Nicolas
> Sent: Monday 24 June 2019 03:53
> To: akhil.go...@nxp.com; dev@dpdk.org
> Cc: tho...@monjalon.net; Yigit, Ferruh ;
> Mokhtar, Amr ; Chautru, Nicolas
> 
> Subject: [PATCH v4 07/10] docs/guides: updating building steps for BBDEV
> PMD
> 
> This now includes steps to build with either
> libraries for AVX2, or AVX512 or no dependency.
> 
> Signed-off-by: Nicolas Chautru 
> ---

Acked-by: Amr Mokhtar 

Re: [dpdk-dev] [PATCH v4 08/10] test-bbdev: update of bbdev test-app for 5GNR

[Mokhtar, Amr]

> -Original Message-
> From: Chautru, Nicolas
> Sent: Monday 24 June 2019 03:53
> To: akhil.go...@nxp.com; dev@dpdk.org
> Cc: tho...@monjalon.net; Yigit, Ferruh ;
> Mokhtar, Amr ; Chautru, Nicolas
> 
> Subject: [PATCH v4 08/10] test-bbdev: update of bbdev test-app for 5GNR
> 
> Extending test framework for FEC 5GNR operations
> for UT verification and profiling.
> 
> Signed-off-by: Nicolas Chautru 
> ---

Acked-by: Amr Mokhtar 

Re: [dpdk-dev] [PATCH v4 09/10] test-bbdev: test vectors for 5GNR verification

[Mokhtar, Amr]

> -Original Message-
> From: Chautru, Nicolas
> Sent: Monday 24 June 2019 03:53
> To: akhil.go...@nxp.com; dev@dpdk.org
> Cc: tho...@monjalon.net; Yigit, Ferruh ;
> Mokhtar, Amr ; Chautru, Nicolas
> 
> Subject: [PATCH v4 09/10] test-bbdev: test vectors for 5GNR verification
> 
> Adding LDPC vectors for UT verification, coverage,
> and profiling for 5GNR encode/decode operations.
> 
> Signed-off-by: Nicolas Chautru 
> ---

> +++ b/app/test-bbdev/test_vectors/ldpc_dec_HARQ_1_0.data
> @@ -0,0 +1,354 @@
> +# SPDX-License-Identifier: BSD-3-Clause
> +# Copyright(c) 2019 Intel Corporation
> +# Origin : FEC5G_UL_1/

Probably a new line between Origin and he license header helps to avoid
any misconception that his somehow relates to the copyright header.
Also, don't understand its purpose here?

> +op_type =
> +RTE_BBDEV_OP_LDPC_DEC

You may retain my ack in further edits..

Acked-by: Amr Mokhtar 

Re: [dpdk-dev] [PATCH v4 10/10] doc: announce bbdev changes

[Mokhtar, Amr]

> -Original Message-
> From: Chautru, Nicolas
> Sent: Monday 24 June 2019 03:53
> To: akhil.go...@nxp.com; dev@dpdk.org
> Cc: tho...@monjalon.net; Yigit, Ferruh ;
> Mokhtar, Amr ; Chautru, Nicolas
> 
> Subject: [PATCH v4 10/10] doc: announce bbdev changes
> 
> Update of the release notes for BBDEV features add
> and extension of ABI in previous commit.
> 
> Signed-off-by: Nicolas Chautru 
> ---

Acked-by: Amr Mokhtar 

Re: [dpdk-dev] [EXT] [PATCH v4 3/6] app/test-compress-perf: add verification test case

[Shally Verma]

From: Tomasz Jozwiak 
Sent: Monday, July 1, 2019 2:33 AM
To: Shally Verma ; dev@dpdk.org; fiona.tr...@intel.com; 
arturx.tryb...@intel.com
Subject: Re: [EXT] [PATCH v4 3/6] app/test-compress-perf: add verification test 
case

…





+ if (ctx != NULL) {

+ ctx->mem.dev_id = dev_id;

+ ctx->mem.qp_id = qp_id;

+ ctx->options = options;

+

+ if (!comp_perf_allocate_memory(ctx->options, &ctx->mem)

&&

+ !prepare_bufs(ctx->options, &ctx->mem))

+ return ctx;

What if condition fails on comp_per_allocate_memory(), then it will go to 
verify_test_destructor(), so comp_perf_free_memory() check if mem != NULL 
before calling actual free?

[Tomek] I mean it's ok. Please take in to account that we was able to allocate 
'cperf_verify_ctx struct' - cause

ctx != NULL here. that means 'mem struct' inside 'cperf_verify_ctx struct' 
exists for sure:

struct cperf_verify_ctx {
struct cperf_mem_resources mem;
struct comp_test_data *options;

int silent;
size_t comp_data_sz;
size_t decomp_data_sz;
double ratio;
};

and all fields inside 'struct cperf_mem_resources mem' are zeroed.

We don't need to check mem != NULL before free, because in this place mem != 
NULL for sure. Also it's ok to call 'rte_free',

'rte_mempool_free' and 'rte_pktmbuf_free' with NULL ptr.

as a argument because the check is inside all of these functions.

[Shally] Okay.





Thx for the comments.



--

Tomek

Re: [dpdk-dev] [PATCH v5 1/2] net/mlx5: fix crashing testpmd on null drv opts

[Slava Ovsiienko]

Acked-by: Viacheslav Ovsiienko 
Thanks

> -Original Message-
> From: dev  On Behalf Of Moti Haimovsky
> Sent: Wednesday, June 19, 2019 7:52
> To: Shahaf Shuler 
> Cc: dev@dpdk.org; sta...@dpdk.org
> Subject: [dpdk-dev] [PATCH v5 1/2] net/mlx5: fix crashing testpmd on null drv
> opts
> 
> mlx5 implements mlx5_flow_null_drv_ops to be used when a specific flow
> typei/driver is not available or invalid.
> This routines return error without modifying the rte_flow_error parameter
> passed to them which causes testpmd, for example, to crash.
> This commit addresses the issue by modifying the rte_flow_error parameter
> in theses routines.
> 
> Fixes: 0c76d1c9a18d ("net/mlx5: add abstraction for multiple flow drivers")
> Fixes: 684dafe795d0 ("net/mlx5: add flow query abstraction interface")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Moti Haimovsky 
> ---
> v4,v5:
>  * Resend the message from a server not inserting DOS line-termination
>symbols.
> 
> v3:
>  * Modified patch subject.
> 
> v2:
>  * Fixed checkpatch warnings.
> ---
>  drivers/net/mlx5/mlx5_flow.c | 29 +++--
>  1 file changed, 15 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
> index 9887018..e5a8e33 100644
> --- a/drivers/net/mlx5/mlx5_flow.c
> +++ b/drivers/net/mlx5/mlx5_flow.c
> @@ -1694,19 +1694,20 @@ uint32_t mlx5_flow_adjust_priority(struct
> rte_eth_dev *dev, int32_t priority,
>  const struct rte_flow_attr *attr __rte_unused,
>  const struct rte_flow_item items[] __rte_unused,
>  const struct rte_flow_action actions[] __rte_unused,
> -struct rte_flow_error *error __rte_unused)
> +struct rte_flow_error *error)
>  {
> - rte_errno = ENOTSUP;
> - return -rte_errno;
> + return rte_flow_error_set(error, ENOTSUP,
> +   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> NULL, NULL);
>  }
> 
>  static struct mlx5_flow *
>  flow_null_prepare(const struct rte_flow_attr *attr __rte_unused,
> const struct rte_flow_item items[] __rte_unused,
> const struct rte_flow_action actions[] __rte_unused,
> -   struct rte_flow_error *error __rte_unused)
> +   struct rte_flow_error *error)
>  {
> - rte_errno = ENOTSUP;
> + rte_flow_error_set(error, ENOTSUP,
> +RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,
> NULL);
>   return NULL;
>  }
> 
> @@ -1716,19 +1717,19 @@ uint32_t mlx5_flow_adjust_priority(struct
> rte_eth_dev *dev, int32_t priority,
>   const struct rte_flow_attr *attr __rte_unused,
>   const struct rte_flow_item items[] __rte_unused,
>   const struct rte_flow_action actions[] __rte_unused,
> - struct rte_flow_error *error __rte_unused)
> + struct rte_flow_error *error)
>  {
> - rte_errno = ENOTSUP;
> - return -rte_errno;
> + return rte_flow_error_set(error, ENOTSUP,
> +   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> NULL, NULL);
>  }
> 
>  static int
>  flow_null_apply(struct rte_eth_dev *dev __rte_unused,
>   struct rte_flow *flow __rte_unused,
> - struct rte_flow_error *error __rte_unused)
> + struct rte_flow_error *error)
>  {
> - rte_errno = ENOTSUP;
> - return -rte_errno;
> + return rte_flow_error_set(error, ENOTSUP,
> +   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> NULL, NULL);
>  }
> 
>  static void
> @@ -1748,10 +1749,10 @@ uint32_t mlx5_flow_adjust_priority(struct
> rte_eth_dev *dev, int32_t priority,
>   struct rte_flow *flow __rte_unused,
>   const struct rte_flow_action *actions __rte_unused,
>   void *data __rte_unused,
> - struct rte_flow_error *error __rte_unused)
> + struct rte_flow_error *error)
>  {
> - rte_errno = ENOTSUP;
> - return -rte_errno;
> + return rte_flow_error_set(error, ENOTSUP,
> +   RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
> NULL, NULL);
>  }
> 
>  /* Void driver to protect from null pointer reference. */
> --
> 1.8.3.1

Re: [dpdk-dev] [PATCH] event/dpaa2: fix to return correct value for timeout ticks

[Jerin Jacob Kollanukkaran]

> -Original Message-
> From: Hemant Agrawal 
> Sent: Thursday, June 27, 2019 3:06 PM
> To: dev@dpdk.org
> Cc: Jerin Jacob Kollanukkaran ; Nipun Gupta
> ; sta...@dpdk.org
> Subject: [EXT] [PATCH] event/dpaa2: fix to return correct value for timeout
> ticks
> 
> 
> --
> From: Nipun Gupta 
> 
> Fixes: 0ce3ce7c275c ("event/dpaa2: add configuration functions")
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Nipun Gupta 

Empty git comment is not allowed. Added the following git comment.
"Correct timeout to tick conversion."

Applied to dpdk-next-eventdev/master. Thanks.

Re: [dpdk-dev] [PATCH] app/testpmd: add profiling for Rx/Tx burst routines

[Slava Ovsiienko]

I think we should compromise: keep existing RTE_TEST_PMD_RECORD_CORE_CYCLES
and extend with runtime switch under this build-time option:

#ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
if (record_tx)
  .. gather tx related stats...
if (record_rx)
  .. gather rx related stats...
#endif

This is very specific feature, it is needed while debugging and testing datapath
routines, and It seems this feature with appropriate overhead should not be 
always enabled.
existing build-time configuration options looks OK as for me. 

Bruce, if proposed runtime extension is acceptable - I will update the patch.

WBR,
Slava

> -Original Message-
> From: Bruce Richardson 
> Sent: Friday, June 28, 2019 17:20
> To: Iremonger, Bernard 
> Cc: Slava Ovsiienko ; dev@dpdk.org; Yigit,
> Ferruh 
> Subject: Re: [dpdk-dev] [PATCH] app/testpmd: add profiling for Rx/Tx burst
> routines
> 
> On Fri, Jun 28, 2019 at 02:45:13PM +0100, Iremonger, Bernard wrote:
> > Hi Bruce, Slava,
> >
> > > -Original Message-
> > > From: Slava Ovsiienko [mailto:viachesl...@mellanox.com]
> > > Sent: Thursday, June 27, 2019 5:49 AM
> > > To: Richardson, Bruce 
> > > Cc: dev@dpdk.org; Iremonger, Bernard ;
> > > Yigit, Ferruh 
> > > Subject: RE: [dpdk-dev] [PATCH] app/testpmd: add profiling for Rx/Tx
> > > burst routines
> > >
> > > OK, what do you think about this:
> > >
> > > #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES  if (record_cycle &
> > > RECORD_TX_CORE_CYCLES) {
> > >.. do measurement stuff ..
> > >  }
> > > #endif
> > >
> > > + add some new command to config in runtime: "set record_cycle 3"
> > >
> > > We keep existing RTE_TEST_PMD_RECORD_CORE_CYCLES, do not
> introduce
> > > new build-time configs and get some new runtime configuring.
> > >
> > > WBR,
> > > Slava
> > >
> > > > -Original Message-
> > > > From: Bruce Richardson 
> > > > Sent: Wednesday, June 26, 2019 16:21
> > > > To: Slava Ovsiienko 
> > > > Cc: dev@dpdk.org; bernard.iremon...@intel.com;
> > > > ferruh.yi...@intel.com
> > > > Subject: Re: [dpdk-dev] [PATCH] app/testpmd: add profiling for
> > > > Rx/Tx burst routines
> > > >
> > > > On Wed, Jun 26, 2019 at 01:19:24PM +, Slava Ovsiienko wrote:
> > > > > Hi, Bruce
> > > > >
> > > > > Do you mean using "if (core_rx_cycle_enabled) {...}" instead of #ifdef
> ?
> > > > >
> > > > > No, I did not try runtime control settings.
> > > > > Instead I compared performance with all RECORD_CORE_XX_CYCLES
> > > > options
> > > > > enabled/disabled builds and have seen the ~1-2% performance
> > > > > difference
> > > > on my setups (mainly fwd txonly with retry).
> > > > > So, ticks measuring is not free.
> > > > >
> > > > > With best regards,
> > > > > Slava
> > > > >
> > > > Yes, I realise that measuring ticks is going to have a performance
> impact.
> > > > However, what I was referring to was exactly the former - using an "if"
> > > > rather than an "ifdef". I would hope with ticks disable using this
> > > > option shows no perf impact, and we can reduce the use of
> > > > build-time
> > > configs.
> > > >
> > > > /Bruce
> >
> > Given that  RTE_TEST_PMD_RECORD_CORE_CYCLES is already in the
> config file.
> > I think it is better to be consistent and add the new RECORD macros there.
> >
> > Would it be reasonable to have runtime settings available as well?
> >
> That configuration option is only present right now for the make builds, so 
> I'd
> like to see it replaced with a runtime option rather than see about adding
> more config options to the meson build. The first step should be to avoid
> adding more config options and just look to use dynamic ones. Ideally the
> existing build option should be replaced at the same time.
> 
> /Bruce

[dpdk-dev] [PATCH v2 0/3] update ice code that were not working correctly

[Leyi Rong]

Main changes:
1. Add support for IPv6 based switch filters
2. Add support for ethertype switch filters
3. fix inner L2 offset in GRE dummy packet

Leyi Rong (3):
  net/ice/base: add support for IPv6 based switch filters
  net/ice/base: add support for ethertype switch filters
  net/ice/base: fix inner L2 offset in GRE dummy packet

 drivers/net/ice/base/ice_protocol_type.h |  22 +++--
 drivers/net/ice/base/ice_switch.c| 119 +--
 2 files changed, 124 insertions(+), 17 deletions(-)

-- 
2.17.1

[dpdk-dev] [PATCH v2 3/3] net/ice/base: fix inner L2 offset in GRE dummy packet

[Leyi Rong]

The offset for the inner L2 header in the dummy GRE packet
was off by 2 bytes so updated the offset.

Fixes: 423be7ac8951 ("net/ice/base: enable additional switch rules")

Signed-off-by: Paul M Stillwell Jr 
Signed-off-by: Leyi Rong 
---
 drivers/net/ice/base/ice_switch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ice/base/ice_switch.c 
b/drivers/net/ice/base/ice_switch.c
index 538829771..be43c8ba2 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -65,7 +65,7 @@ struct ice_dummy_pkt_offsets dummy_gre_packet_offsets[] = {
{ ICE_IPV4_OFOS,14 },
{ ICE_NVGRE,34 },
{ ICE_MAC_IL,   42 },
-   { ICE_IPV4_IL,  54 },
+   { ICE_IPV4_IL,  56 },
{ ICE_PROTOCOL_LAST,0 },
 };
 
-- 
2.17.1

[dpdk-dev] [PATCH v2 1/3] net/ice/base: add support for IPv6 based switch filters

[Leyi Rong]

- Add IPv6 switch rule support.
- Add IPv6 training packet.
- Correct name of IPv6 header variable.
- Fix enum values so that they point to the proper
  ice_prot_ext_tbl_entry field.

Signed-off-by: Kevin Scott 
Signed-off-by: Paul M Stillwell Jr 
Signed-off-by: Leyi Rong 
---
 drivers/net/ice/base/ice_protocol_type.h | 16 ++---
 drivers/net/ice/base/ice_switch.c| 87 +++-
 2 files changed, 93 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ice/base/ice_protocol_type.h 
b/drivers/net/ice/base/ice_protocol_type.h
index 033efdb5a..368ab0d16 100644
--- a/drivers/net/ice/base/ice_protocol_type.h
+++ b/drivers/net/ice/base/ice_protocol_type.h
@@ -32,8 +32,8 @@ enum ice_protocol_type {
ICE_MAC_IL,
ICE_IPV4_OFOS,
ICE_IPV4_IL,
-   ICE_IPV6_IL,
ICE_IPV6_OFOS,
+   ICE_IPV6_IL,
ICE_TCP_IL,
ICE_UDP_OF,
ICE_UDP_ILOS,
@@ -200,13 +200,13 @@ struct ice_nvgre {
 };
 
 union ice_prot_hdr {
-   struct ice_ether_hdr eth_hdr;
-   struct ice_ipv4_hdr ipv4_hdr;
-   struct ice_ipv6_hdr ice_ipv6_ofos_hdr;
-   struct ice_l4_hdr l4_hdr;
-   struct ice_sctp_hdr sctp_hdr;
-   struct ice_udp_tnl_hdr tnl_hdr;
-   struct ice_nvgre nvgre_hdr;
+   struct ice_ether_hdr eth_hdr;
+   struct ice_ipv4_hdr ipv4_hdr;
+   struct ice_ipv6_hdr ipv6_hdr;
+   struct ice_l4_hdr l4_hdr;
+   struct ice_sctp_hdr sctp_hdr;
+   struct ice_udp_tnl_hdr tnl_hdr;
+   struct ice_nvgre nvgre_hdr;
 };
 
 /* This is mapping table entry that maps every word within a given protocol
diff --git a/drivers/net/ice/base/ice_switch.c 
b/drivers/net/ice/base/ice_switch.c
index dbf4c5fb0..feacfa483 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -243,6 +243,73 @@ dummy_tcp_packet[] = {
0x00, 0x00, /* 2 bytes for 4 byte alignment */
 };
 
+static const
+struct ice_dummy_pkt_offsets dummy_tcp_ipv6_packet_offsets[] = {
+   { ICE_MAC_OFOS, 0 },
+   { ICE_IPV6_OFOS,14 },
+   { ICE_TCP_IL,   54 },
+   { ICE_PROTOCOL_LAST,0 },
+};
+
+static const u8
+dummy_tcp_ipv6_packet[] = {
+   0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */
+   0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+   0x86, 0xDD,
+
+   0x60, 0x00, 0x00, 0x00, /* ICE_IPV6_OFOS 40 */
+   0x00, 0x14, 0x06, 0x00, /* Next header is TCP */
+   0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+
+   0x00, 0x00, 0x00, 0x00, /* ICE_TCP_IL 54 */
+   0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+   0x50, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+
+   0x00, 0x00, /* 2 bytes for 4 byte alignment */
+};
+
+static const
+struct ice_dummy_pkt_offsets dummy_udp_ipv6_packet_offsets[] = {
+   { ICE_MAC_OFOS, 0 },
+   { ICE_IPV6_OFOS,14 },
+   { ICE_UDP_ILOS, 54 },
+   { ICE_PROTOCOL_LAST,0 },
+};
+
+static const u8
+dummy_udp_ipv6_packet[] = {
+   0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */
+   0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+   0x86, 0xDD,
+
+   0x60, 0x00, 0x00, 0x00, /* ICE_IPV6_OFOS 40 */
+   0x00, 0x08, 0x11, 0x00, /* Next header UDP*/
+   0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+   0x00, 0x00, 0x00, 0x00,
+
+   0x00, 0x00, 0x00, 0x00, /* ICE_UDP_ILOS 54 */
+   0x00, 0x08, 0x00, 0x00,
+
+   0x00, 0x00, /* 2 bytes for 4 byte alignment */
+};
+
 /* this is a recipe to profile bitmap association */
 static ice_declare_bitmap(recipe_to_profile[ICE_MAX_NUM_RECIPES],
  ICE_MAX_NUM_PROFILES);
@@ -5275,7 +5342,7 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, 
u16 lkups_cnt,
  u16 *pkt_len,
  const struct ice_dummy_pkt_offsets **offsets)
 {
-   bool tcp = false, udp = false;
+   bool tcp = false, udp = false, ipv6 = false;
u16 i;
 
for (i = 0; i < lkups_cnt; i++) {
@@ -5283,6 +5350,8 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, 
u16 lkups_cnt,
udp = true;
else if (lkups[i].type == ICE_TCP_IL)
tcp = true;
+   else if (lkups[i].type == ICE_IPV6_OFOS)
+   ipv6 = true;
}
 
if (tun_type == ICE_SW_TUN_NVGRE || tun_type == ICE_ALL_TUNNELS) {
@@ -5307,11 +5376,21 @@ ice_find_dummy_packet(struct ice_adv_lkup_elem *lkups, 
u16 lkups_cnt,
return;
}
 
-   if (u

[dpdk-dev] [PATCH v2 2/3] net/ice/base: add support for ethertype switch filters

[Leyi Rong]

Add protocol definitions for ethertype.
Add ice_ethtype_hdr structure definition into the ice_prot_hdr union.
Add ethtype offsets into the training packet maps.

Signed-off-by: Dan Nowlin 
Signed-off-by: Paul M Stillwell Jr 
Signed-off-by: Leyi Rong 
Tested-by: Wei Zhao 
---
 drivers/net/ice/base/ice_protocol_type.h |  6 +
 drivers/net/ice/base/ice_switch.c| 34 ++--
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ice/base/ice_protocol_type.h 
b/drivers/net/ice/base/ice_protocol_type.h
index 368ab0d16..cfbe3fbfa 100644
--- a/drivers/net/ice/base/ice_protocol_type.h
+++ b/drivers/net/ice/base/ice_protocol_type.h
@@ -30,6 +30,7 @@
 enum ice_protocol_type {
ICE_MAC_OFOS = 0,
ICE_MAC_IL,
+   ICE_ETYPE_OL,
ICE_IPV4_OFOS,
ICE_IPV4_IL,
ICE_IPV6_OFOS,
@@ -108,6 +109,7 @@ enum ice_prot_id {
 
 #define ICE_MAC_OFOS_HW1
 #define ICE_MAC_IL_HW  4
+#define ICE_ETYPE_OL_HW9
 #define ICE_IPV4_OFOS_HW   32
 #define ICE_IPV4_IL_HW 33
 #define ICE_IPV6_OFOS_HW   40
@@ -140,6 +142,9 @@ struct ice_protocol_entry {
 struct ice_ether_hdr {
u8 dst_addr[ETH_ALEN];
u8 src_addr[ETH_ALEN];
+};
+
+struct ice_ethtype_hdr {
u16 ethtype_id;
 };
 
@@ -201,6 +206,7 @@ struct ice_nvgre {
 
 union ice_prot_hdr {
struct ice_ether_hdr eth_hdr;
+   struct ice_ethtype_hdr ethertype;
struct ice_ipv4_hdr ipv4_hdr;
struct ice_ipv6_hdr ipv6_hdr;
struct ice_l4_hdr l4_hdr;
diff --git a/drivers/net/ice/base/ice_switch.c 
b/drivers/net/ice/base/ice_switch.c
index feacfa483..538829771 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -61,6 +61,7 @@ struct ice_dummy_pkt_offsets {
 static const
 struct ice_dummy_pkt_offsets dummy_gre_packet_offsets[] = {
{ ICE_MAC_OFOS, 0 },
+   { ICE_ETYPE_OL, 12 },
{ ICE_IPV4_OFOS,14 },
{ ICE_NVGRE,34 },
{ ICE_MAC_IL,   42 },
@@ -72,7 +73,7 @@ static const
 u8 dummy_gre_packet[] = { 0, 0, 0, 0,  /* ICE_MAC_OFOS 0 */
  0, 0, 0, 0,
  0, 0, 0, 0,
- 0x08, 0,
+ 0x08, 0,  /* ICE_ETYPE_OL 12 */
  0x45, 0, 0, 0x3E, /* ICE_IPV4_OFOS 14 */
  0, 0, 0, 0,
  0, 0x2F, 0, 0,
@@ -94,6 +95,7 @@ u8 dummy_gre_packet[] = { 0, 0, 0, 0, /* ICE_MAC_OFOS 
0 */
 static const
 struct ice_dummy_pkt_offsets dummy_udp_tun_tcp_packet_offsets[] = {
{ ICE_MAC_OFOS, 0 },
+   { ICE_ETYPE_OL, 12 },
{ ICE_IPV4_OFOS,14 },
{ ICE_UDP_OF,   34 },
{ ICE_VXLAN,42 },
@@ -108,7 +110,8 @@ u8 dummy_udp_tun_tcp_packet[] = {
0x00, 0x00, 0x00, 0x00,  /* ICE_MAC_OFOS 0 */
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
-   0x08, 0x00,
+
+   0x08, 0x00, /* ICE_ETYPE_OL 12 */
 
0x45, 0x00, 0x00, 0x5a, /* ICE_IPV4_OFOS 14 */
0x00, 0x01, 0x00, 0x00,
@@ -143,6 +146,7 @@ u8 dummy_udp_tun_tcp_packet[] = {
 static const
 struct ice_dummy_pkt_offsets dummy_udp_tun_udp_packet_offsets[] = {
{ ICE_MAC_OFOS, 0 },
+   { ICE_ETYPE_OL, 12 },
{ ICE_IPV4_OFOS,14 },
{ ICE_UDP_OF,   34 },
{ ICE_VXLAN,42 },
@@ -157,7 +161,8 @@ u8 dummy_udp_tun_udp_packet[] = {
0x00, 0x00, 0x00, 0x00,  /* ICE_MAC_OFOS 0 */
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
-   0x08, 0x00,
+
+   0x08, 0x00, /* ICE_ETYPE_OL 12 */
 
0x45, 0x00, 0x00, 0x4e, /* ICE_IPV4_OFOS 14 */
0x00, 0x01, 0x00, 0x00,
@@ -189,6 +194,7 @@ u8 dummy_udp_tun_udp_packet[] = {
 static const
 struct ice_dummy_pkt_offsets dummy_udp_packet_offsets[] = {
{ ICE_MAC_OFOS, 0 },
+   { ICE_ETYPE_OL, 12 },
{ ICE_IPV4_OFOS,14 },
{ ICE_UDP_ILOS, 34 },
{ ICE_PROTOCOL_LAST,0 },
@@ -199,7 +205,8 @@ dummy_udp_packet[] = {
0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
-   0x08, 0x00,
+
+   0x08, 0x00, /* ICE_ETYPE_OL 12 */
 
0x45, 0x00, 0x00, 0x1c, /* ICE_IPV4_OFOS 14 */
0x00, 0x01, 0x00, 0x00,
@@ -216,6 +223,7 @@ dummy_udp_packet[] = {
 static const
 struct ice_dummy_pkt_offsets dummy_tcp_packet_offsets[] = {
{ ICE_MAC_OFOS, 0 },
+   { ICE_ETYPE_OL, 12 },
{ ICE_IPV4_OFOS,14 },
{ ICE_TCP_IL,   34 },
{ ICE_PROTOCOL_LAST,0 },
@@ -226,7 +234,8 @@ dummy_tcp_packet[] = {
0x00, 0x00, 0x00, 0x00, /* ICE_MAC_OFOS 0 */
0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
-   0x08, 0x00,

Re: [dpdk-dev] [PATCH 1/4] ethdev: add GRE key field to flow API

[Ori Kam]

Hi Jack,

I know I acked this patch, but after Dekel patch, 
https://patches.dpdk.org/patch/55667/

Where it was decided to remove structures for just one variable, 
and simply use the value. I wish if possible that you will also modify this
patch to match this new convention.


Thanks,
Ori Kam

> -Original Message-
> From: dev  On Behalf Of Xiaoyu Min
> Sent: Monday, June 24, 2019 6:40 PM
> To: Adrien Mazarguil ; John McNamara
> ; Marko Kovacevic
> ; Thomas Monjalon ;
> Ferruh Yigit ; Andrew Rybchenko
> 
> Cc: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH 1/4] ethdev: add GRE key field to flow API
> 
> Add new rte_flow_item_gre_key in order to match the optional key field.
> 
> Signed-off-by: Xiaoyu Min 
> ---
>  doc/guides/prog_guide/rte_flow.rst |  9 +
>  lib/librte_ethdev/rte_flow.c   |  1 +
>  lib/librte_ethdev/rte_flow.h   | 27 +++
>  3 files changed, 37 insertions(+)
> 
> diff --git a/doc/guides/prog_guide/rte_flow.rst
> b/doc/guides/prog_guide/rte_flow.rst
> index a34d012e55..e900a53e3c 100644
> --- a/doc/guides/prog_guide/rte_flow.rst
> +++ b/doc/guides/prog_guide/rte_flow.rst
> @@ -980,6 +980,15 @@ Matches a GRE header.
>  - ``protocol``: protocol type.
>  - Default ``mask`` matches protocol only.
> 
> +Item: ``GRE_KEY``
> +^
> +
> +Matches a GRE key field.
> +This should be preceded by item ``GRE``
> +
> +- ``key``: key value.
> +- Default ``mask`` matches key only.
> +
>  Item: ``FUZZY``
>  ^^^
> 
> diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c
> index 3277be1edb..1cd5f4d263 100644
> --- a/lib/librte_ethdev/rte_flow.c
> +++ b/lib/librte_ethdev/rte_flow.c
> @@ -55,6 +55,7 @@ static const struct rte_flow_desc_data
> rte_flow_desc_item[] = {
>   MK_FLOW_ITEM(NVGRE, sizeof(struct rte_flow_item_nvgre)),
>   MK_FLOW_ITEM(MPLS, sizeof(struct rte_flow_item_mpls)),
>   MK_FLOW_ITEM(GRE, sizeof(struct rte_flow_item_gre)),
> + MK_FLOW_ITEM(GRE_KEY, sizeof(struct rte_flow_item_gre_key)),
>   MK_FLOW_ITEM(FUZZY, sizeof(struct rte_flow_item_fuzzy)),
>   MK_FLOW_ITEM(GTP, sizeof(struct rte_flow_item_gtp)),
>   MK_FLOW_ITEM(GTPC, sizeof(struct rte_flow_item_gtp)),
> diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h
> index f3a8fb103f..a708ccd53b 100644
> --- a/lib/librte_ethdev/rte_flow.h
> +++ b/lib/librte_ethdev/rte_flow.h
> @@ -289,6 +289,13 @@ enum rte_flow_item_type {
>*/
>   RTE_FLOW_ITEM_TYPE_GRE,
> 
> + /**
> +  * Matches a GRE optional key field.
> +  *
> +  * See struct rte_flow_item_gre_key.
> +  */
> + RTE_FLOW_ITEM_TYPE_GRE_KEY,
> +
>   /**
>* [META]
>*
> @@ -856,6 +863,26 @@ static const struct rte_flow_item_gre
> rte_flow_item_gre_mask = {
>  };
>  #endif
> 
> +/**
> + * RTE_FLOW_ITEM_GRE_KEY.
> + *
> + * Matches the presence of a GRE key.
> + *
> + * Normally preceding by:
> + *
> + * - RTE_FLOW_ITEM_TYPE_GRE
> + */
> +struct rte_flow_item_gre_key {
> + rte_be32_t key; /**< Application specific key value (K bit). */
> +};
> +
> +/** Default mask for RTE_FLOW_ITEM_TYPE_GRE_KEY. */
> +#ifndef __cplusplus
> +static const struct rte_flow_item_gre_key rte_flow_item_gre_key_mask = {
> + .key = RTE_BE32(UINT32_MAX),
> +};
> +#endif
> +
>  /**
>   * RTE_FLOW_ITEM_TYPE_FUZZY
>   *
> --
> 2.21.0