[dpdk-stable] patch 'net/octeontx: fix packet corruption on Tx' has been queued to LTS release 17.11.5

[dpdk-stable] patch 'net/octeontx: fix packet corruption on Tx' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 71b0c00e7df02ce45093baaf7ecfb54f8ba2c12c Mon Sep 17 00:00:00 2001
From: Jerin Jacob <jerin.jacob@caviumnetworks.com>
Date: Fri, 17 Aug 2018 20:00:22 +0530
Subject: [PATCH] net/octeontx: fix packet corruption on Tx

[ backported from upstream commit 9f92552eb997819d8af80b0634849070075cce2a ]

LMTST does not guarantee packet content get synced with L2C when
HW access the packet for transmitting.

Adding coherent IO write barrier will make sure HW sees the correct
packet if its modified.

Fixes: 9e747589bd4c ("net/octeontx: add packet transmit burst function")

Reported-by: Vikas Aggarwal <vikas.aggarwal@caviumnetworks.com>
Signed-off-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
Acked-by: Santosh Shukla <santosh.shukla@caviumnetworks.com>
---
 drivers/net/octeontx/octeontx_rxtx.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/octeontx/octeontx_rxtx.c b/drivers/net/octeontx/octeontx_rxtx.c
index c97d5b351..e6f917f72 100644
--- a/drivers/net/octeontx/octeontx_rxtx.c
+++ b/drivers/net/octeontx/octeontx_rxtx.c
@@ -91,6 +91,7 @@ octeontx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 
 	count = 0;
 
+	rte_io_wmb();
 	while (count < nb_pkts) {
 		res = __octeontx_xmit_pkts(dq->lmtline_va, dq->ioreg_va,
 					   dq->fc_status_va,
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:10.908957324 -0800
+++ 0001-net-octeontx-fix-packet-corruption-on-Tx.patch	2019-01-11 02:29:10.643973000 -0800
@@ -1,8 +1,10 @@
-From 9f92552eb997819d8af80b0634849070075cce2a Mon Sep 17 00:00:00 2001
+From 71b0c00e7df02ce45093baaf7ecfb54f8ba2c12c Mon Sep 17 00:00:00 2001
 From: Jerin Jacob <jerin.jacob@caviumnetworks.com>
 Date: Fri, 17 Aug 2018 20:00:22 +0530
 Subject: [PATCH] net/octeontx: fix packet corruption on Tx
 
+[ backported from upstream commit 9f92552eb997819d8af80b0634849070075cce2a ]
+
 LMTST does not guarantee packet content get synced with L2C when
 HW access the packet for transmitting.
 
@@ -10,7 +12,6 @@
 packet if its modified.
 
 Fixes: 9e747589bd4c ("net/octeontx: add packet transmit burst function")
-Cc: stable@dpdk.org
 
 Reported-by: Vikas Aggarwal <vikas.aggarwal@caviumnetworks.com>
 Signed-off-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
@@ -20,14 +21,14 @@
  1 file changed, 1 insertion(+)
 
 diff --git a/drivers/net/octeontx/octeontx_rxtx.c b/drivers/net/octeontx/octeontx_rxtx.c
-index a9149b4e1..f861313e6 100644
+index c97d5b351..e6f917f72 100644
 --- a/drivers/net/octeontx/octeontx_rxtx.c
 +++ b/drivers/net/octeontx/octeontx_rxtx.c
-@@ -63,6 +63,7 @@ octeontx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
+@@ -91,6 +91,7 @@ octeontx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
  
  	count = 0;
  
-+	rte_cio_wmb();
++	rte_io_wmb();
  	while (count < nb_pkts) {
  		res = __octeontx_xmit_pkts(dq->lmtline_va, dq->ioreg_va,
  					   dq->fc_status_va,

[dpdk-stable] patch 'doc: fix style and syntax in flow API guide' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 1d991d1aaca5c60fce342379f076f12feb95a837 Mon Sep 17 00:00:00 2001
From: Ilya Maximets <i.maximets@samsung.com>
Date: Thu, 23 Aug 2018 11:05:54 +0300
Subject: [PATCH] doc: fix style and syntax in flow API guide

[ upstream commit 1334586b669c1d27aec2bffd0b1ed9f542cd7d19 ]

Fixes: 3e0ceb9f17ff ("doc: add basic howto for flow API")

Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 doc/guides/howto/rte_flow.rst | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/guides/howto/rte_flow.rst b/doc/guides/howto/rte_flow.rst
index 4a27c995d..62cac45e6 100644
--- a/doc/guides/howto/rte_flow.rst
+++ b/doc/guides/howto/rte_flow.rst
@@ -60,7 +60,7 @@ Code
 .. code-block:: c
 
   /* create the attribute structure */
-  struct rte_flow_attr attr = {.ingress = 1};
+  struct rte_flow_attr attr = { .ingress = 1 };
   struct rte_flow_item pattern[MAX_PATTERN_IN_FLOW];
   struct rte_flow_action actions[MAX_ACTIONS_IN_FLOW];
   struct rte_flow_item_etc eth;
@@ -90,8 +90,8 @@ Code
   actions[1].type = RTE_FLOW_ACTION_TYPE_END;
 
   /* validate and create the flow rule */
-  if (!rte_flow_validate(port_id, &attr, pattern, actions, &error)
-      flow = rte_flow_create(port_id, &attr, pattern, actions, &error)
+  if (!rte_flow_validate(port_id, &attr, pattern, actions, &error))
+      flow = rte_flow_create(port_id, &attr, pattern, actions, &error);
 
 Output
 ~~~~~~
@@ -148,7 +148,7 @@ clarity)::
 
   tpmd> flow create 0 ingress pattern eth / vlan /
                     ipv4 dst spec 192.168.3.0 dst mask 255.255.255.0 /
-	            end actions drop / end
+                    end actions drop / end
 
 Code
 ~~~~
@@ -188,8 +188,8 @@ Code
   actions[1].type = RTE_FLOW_ACTION_TYPE_END;
 
   /* validate and create the flow rule */
-  if (!rte_flow_validate(port_id, &attr, pattern, actions, &error)
-      flow = rte_flow_create(port_id, &attr, pattern, actions, &error)
+  if (!rte_flow_validate(port_id, &attr, pattern, actions, &error))
+      flow = rte_flow_create(port_id, &attr, pattern, actions, &error);
 
 Output
 ~~~~~~
@@ -255,7 +255,7 @@ Code
 
 .. code-block:: c
 
-  struct rte_flow_attr attr = {.ingress = 1};
+  struct rte_flow_attr attr = { .ingress = 1 };
   struct rte_flow_item pattern[MAX_PATTERN_IN_FLOW];
   struct rte_flow_action actions[MAX_ACTIONS_IN_FLOW];
   struct rte_flow_item_etc eth;
@@ -278,12 +278,12 @@ Code
 
   /* create the drop action */
   actions[0].type = RTE_FLOW_ACTION_TYPE_QUEUE;
-  actions[0].conf = &queue
+  actions[0].conf = &queue;
   actions[1].type = RTE_FLOW_ACTION_TYPE_END;
 
   /* validate and create the flow rule */
-  if (!rte_flow_validate(port_id, &attr, pattern, actions, &error)
-      flow = rte_flow_create(port_id, &attr, pattern, actions, &error)
+  if (!rte_flow_validate(port_id, &attr, pattern, actions, &error))
+      flow = rte_flow_create(port_id, &attr, pattern, actions, &error);
 
 Output
 ~~~~~~
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:10.976399520 -0800
+++ 0002-doc-fix-style-and-syntax-in-flow-API-guide.patch	2019-01-11 02:29:10.653974000 -0800
@@ -1,10 +1,11 @@
-From 1334586b669c1d27aec2bffd0b1ed9f542cd7d19 Mon Sep 17 00:00:00 2001
+From 1d991d1aaca5c60fce342379f076f12feb95a837 Mon Sep 17 00:00:00 2001
 From: Ilya Maximets <i.maximets@samsung.com>
 Date: Thu, 23 Aug 2018 11:05:54 +0300
 Subject: [PATCH] doc: fix style and syntax in flow API guide
 
+[ upstream commit 1334586b669c1d27aec2bffd0b1ed9f542cd7d19 ]
+
 Fixes: 3e0ceb9f17ff ("doc: add basic howto for flow API")
-Cc: stable@dpdk.org
 
 Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
 Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
@@ -13,10 +14,10 @@
  1 file changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/doc/guides/howto/rte_flow.rst b/doc/guides/howto/rte_flow.rst
-index caa4e1afd..c71152161 100644
+index 4a27c995d..62cac45e6 100644
 --- a/doc/guides/howto/rte_flow.rst
 +++ b/doc/guides/howto/rte_flow.rst
-@@ -32,7 +32,7 @@ Code
+@@ -60,7 +60,7 @@ Code
  .. code-block:: c
  
    /* create the attribute structure */
@@ -25,7 +26,7 @@
    struct rte_flow_item pattern[MAX_PATTERN_IN_FLOW];
    struct rte_flow_action actions[MAX_ACTIONS_IN_FLOW];
    struct rte_flow_item_etc eth;
-@@ -62,8 +62,8 @@ Code
+@@ -90,8 +90,8 @@ Code
    actions[1].type = RTE_FLOW_ACTION_TYPE_END;
  
    /* validate and create the flow rule */
@@ -36,7 +37,7 @@
  
  Output
  ~~~~~~
-@@ -120,7 +120,7 @@ clarity)::
+@@ -148,7 +148,7 @@ clarity)::
  
    tpmd> flow create 0 ingress pattern eth / vlan /
                      ipv4 dst spec 192.168.3.0 dst mask 255.255.255.0 /
@@ -45,7 +46,7 @@
  
  Code
  ~~~~
-@@ -160,8 +160,8 @@ Code
+@@ -188,8 +188,8 @@ Code
    actions[1].type = RTE_FLOW_ACTION_TYPE_END;
  
    /* validate and create the flow rule */
@@ -56,7 +57,7 @@
  
  Output
  ~~~~~~
-@@ -227,7 +227,7 @@ Code
+@@ -255,7 +255,7 @@ Code
  
  .. code-block:: c
  
@@ -65,9 +66,9 @@
    struct rte_flow_item pattern[MAX_PATTERN_IN_FLOW];
    struct rte_flow_action actions[MAX_ACTIONS_IN_FLOW];
    struct rte_flow_item_etc eth;
-@@ -250,12 +250,12 @@ Code
+@@ -278,12 +278,12 @@ Code
  
-   /* create the queue action */
+   /* create the drop action */
    actions[0].type = RTE_FLOW_ACTION_TYPE_QUEUE;
 -  actions[0].conf = &queue
 +  actions[0].conf = &queue;

[dpdk-stable] patch 'net/mvpp2: fix array initialization' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From a4779fc6bbf8d0267293f88aba2718fd138eaf29 Mon Sep 17 00:00:00 2001
From: Tomasz Duszynski <tdu@semihalf.com>
Date: Fri, 24 Aug 2018 20:30:00 +0200
Subject: [PATCH] net/mvpp2: fix array initialization

[ upstream commit fe37bf0f7d43ceab88a3b71ef1b13d509c1b7bb9 ]

Fix used_bpools array initialization by using range initializer.
This way all necessary variables are properly initialized regardless
of PP2_NUM_PKT_PROC value.

Fixes: 0ddc9b815b11 ("net/mrvl: add net PMD skeleton")

Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
---
 drivers/net/mrvl/mrvl_ethdev.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/mrvl/mrvl_ethdev.c b/drivers/net/mrvl/mrvl_ethdev.c
index 2fc247855..ba69f1cbe 100644
--- a/drivers/net/mrvl/mrvl_ethdev.c
+++ b/drivers/net/mrvl/mrvl_ethdev.c
@@ -107,8 +107,7 @@ static const char * const valid_args[] = {
 static int used_hifs = MRVL_MUSDK_HIFS_RESERVED;
 static struct pp2_hif *hifs[RTE_MAX_LCORE];
 static int used_bpools[PP2_NUM_PKT_PROC] = {
-	MRVL_MUSDK_BPOOLS_RESERVED,
-	MRVL_MUSDK_BPOOLS_RESERVED
+	[0 ... PP2_NUM_PKT_PROC - 1] = MRVL_MUSDK_BPOOLS_RESERVED
 };
 
 struct pp2_bpool *mrvl_port_to_bpool_lookup[RTE_MAX_ETHPORTS];
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.036382751 -0800
+++ 0003-net-mvpp2-fix-array-initialization.patch	2019-01-11 02:29:10.671973000 -0800
@@ -1,25 +1,26 @@
-From fe37bf0f7d43ceab88a3b71ef1b13d509c1b7bb9 Mon Sep 17 00:00:00 2001
+From a4779fc6bbf8d0267293f88aba2718fd138eaf29 Mon Sep 17 00:00:00 2001
 From: Tomasz Duszynski <tdu@semihalf.com>
 Date: Fri, 24 Aug 2018 20:30:00 +0200
 Subject: [PATCH] net/mvpp2: fix array initialization
 
+[ upstream commit fe37bf0f7d43ceab88a3b71ef1b13d509c1b7bb9 ]
+
 Fix used_bpools array initialization by using range initializer.
 This way all necessary variables are properly initialized regardless
 of PP2_NUM_PKT_PROC value.
 
 Fixes: 0ddc9b815b11 ("net/mrvl: add net PMD skeleton")
-Cc: stable@dpdk.org
 
 Signed-off-by: Tomasz Duszynski <tdu@semihalf.com>
 ---
- drivers/net/mvpp2/mrvl_ethdev.c | 3 +--
+ drivers/net/mrvl/mrvl_ethdev.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c
-index 8e1a32f41..fdf416b04 100644
---- a/drivers/net/mvpp2/mrvl_ethdev.c
-+++ b/drivers/net/mvpp2/mrvl_ethdev.c
-@@ -84,8 +84,7 @@ static const char * const valid_args[] = {
+diff --git a/drivers/net/mrvl/mrvl_ethdev.c b/drivers/net/mrvl/mrvl_ethdev.c
+index 2fc247855..ba69f1cbe 100644
+--- a/drivers/net/mrvl/mrvl_ethdev.c
++++ b/drivers/net/mrvl/mrvl_ethdev.c
+@@ -107,8 +107,7 @@ static const char * const valid_args[] = {
  static int used_hifs = MRVL_MUSDK_HIFS_RESERVED;
  static struct pp2_hif *hifs[RTE_MAX_LCORE];
  static int used_bpools[PP2_NUM_PKT_PROC] = {

[dpdk-stable] patch 'net/mlx5: fix interrupt completion queue index wrapping' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 7d4722302950879e32fcba9454aa956bf9fd0e2c Mon Sep 17 00:00:00 2001
From: Xueming Li <xuemingl@mellanox.com>
Date: Fri, 24 Aug 2018 07:10:33 +0800
Subject: [PATCH] net/mlx5: fix interrupt completion queue index wrapping

[ backported from upstream commit 3afdf157fcedba15167ad03b187746bd6c73811f ]

Rxq cq_ci was 16 bits while hardware is expecting to wrap
around 24 bits, this caused interrupt failure after burst of packets.

Fixes: 43e9d9794cde ("net/mlx5: support upstream rdma-core")

Signed-off-by: Xueming Li <xuemingl@mellanox.com>
Acked-by: Yongseok Koh <yskoh@mellanox.com>
---
 drivers/net/mlx5/mlx5_rxtx.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h
index 5556a0f7a..7e811c106 100644
--- a/drivers/net/mlx5/mlx5_rxtx.h
+++ b/drivers/net/mlx5/mlx5_rxtx.h
@@ -138,9 +138,9 @@ struct mlx5_rxq_data {
 	volatile uint32_t *rq_db;
 	volatile uint32_t *cq_db;
 	uint16_t port_id;
-	uint16_t rq_ci;
-	uint16_t rq_pi;
-	uint16_t cq_ci;
+	uint32_t rq_ci;
+	uint32_t rq_pi;
+	uint32_t cq_ci;
 	uint16_t rq_repl_thresh; /* Threshold for buffer replenishment. */
 	struct mlx5_mr_ctrl mr_ctrl;
 	volatile struct mlx5_wqe_data_seg(*wqes)[];
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.097649981 -0800
+++ 0004-net-mlx5-fix-interrupt-completion-queue-index-wrappi.patch	2019-01-11 02:29:10.683973000 -0800
@@ -1,52 +1,38 @@
-From 3afdf157fcedba15167ad03b187746bd6c73811f Mon Sep 17 00:00:00 2001
+From 7d4722302950879e32fcba9454aa956bf9fd0e2c Mon Sep 17 00:00:00 2001
 From: Xueming Li <xuemingl@mellanox.com>
 Date: Fri, 24 Aug 2018 07:10:33 +0800
 Subject: [PATCH] net/mlx5: fix interrupt completion queue index wrapping
 
+[ backported from upstream commit 3afdf157fcedba15167ad03b187746bd6c73811f ]
+
 Rxq cq_ci was 16 bits while hardware is expecting to wrap
 around 24 bits, this caused interrupt failure after burst of packets.
 
 Fixes: 43e9d9794cde ("net/mlx5: support upstream rdma-core")
-Cc: stable@dpdk.org
 
 Signed-off-by: Xueming Li <xuemingl@mellanox.com>
 Acked-by: Yongseok Koh <yskoh@mellanox.com>
 ---
- drivers/net/mlx5/mlx5_rxtx.c | 2 +-
  drivers/net/mlx5/mlx5_rxtx.h | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
-index 2d14f8a6e..558e6b60a 100644
---- a/drivers/net/mlx5/mlx5_rxtx.c
-+++ b/drivers/net/mlx5/mlx5_rxtx.c
-@@ -2097,7 +2097,7 @@ mlx5_rx_burst_mprq(void *dpdk_rxq, struct rte_mbuf **pkts, uint16_t pkts_n)
- 	const unsigned int wq_mask = (1 << rxq->elts_n) - 1;
- 	volatile struct mlx5_cqe *cqe = &(*rxq->cqes)[rxq->cq_ci & cq_mask];
- 	unsigned int i = 0;
--	uint16_t rq_ci = rxq->rq_ci;
-+	uint32_t rq_ci = rxq->rq_ci;
- 	uint16_t consumed_strd = rxq->consumed_strd;
- 	struct mlx5_mprq_buf *buf = (*rxq->mprq_bufs)[rq_ci & wq_mask];
- 
 diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h
-index 48ed2b209..d225b9c27 100644
+index 5556a0f7a..7e811c106 100644
 --- a/drivers/net/mlx5/mlx5_rxtx.h
 +++ b/drivers/net/mlx5/mlx5_rxtx.h
-@@ -97,10 +97,10 @@ struct mlx5_rxq_data {
+@@ -138,9 +138,9 @@ struct mlx5_rxq_data {
  	volatile uint32_t *rq_db;
  	volatile uint32_t *cq_db;
  	uint16_t port_id;
 -	uint16_t rq_ci;
-+	uint32_t rq_ci;
- 	uint16_t consumed_strd; /* Number of consumed strides in WQE. */
 -	uint16_t rq_pi;
 -	uint16_t cq_ci;
++	uint32_t rq_ci;
 +	uint32_t rq_pi;
 +	uint32_t cq_ci;
- 	struct mlx5_mr_ctrl mr_ctrl; /* MR control descriptor. */
- 	uint16_t mprq_max_memcpy_len; /* Maximum size of packet to memcpy. */
- 	volatile void *wqes;
+ 	uint16_t rq_repl_thresh; /* Threshold for buffer replenishment. */
+ 	struct mlx5_mr_ctrl mr_ctrl;
+ 	volatile struct mlx5_wqe_data_seg(*wqes)[];
 -- 
 2.11.0
 

[dpdk-stable] patch 'doc: fix missing CCM to QAT feature list' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 916081d82ed4e9a8b3f2ced9bcd0d798dd114bb7 Mon Sep 17 00:00:00 2001
From: Tomasz Cel <tomaszx.cel@intel.com>
Date: Wed, 19 Sep 2018 08:27:18 +0200
Subject: [PATCH] doc: fix missing CCM to QAT feature list

[ upstream commit 7bd6f76ee678ec6aa81cb53562f852a43e842718 ]

Update the QAT documentation to show that it supports CCM.

Fixes: ab56c4d9ed9a ("crypto/qat: support AES-CCM")

Signed-off-by: Tomasz Cel <tomaszx.cel@intel.com>
Acked-by: Fiona Trahe <fiona.trahe@intel.com>
Acked-by: Marko Kovacevic <marko.kovacevic@intel.com>
---
 doc/guides/cryptodevs/features/qat.ini | 3 +++
 doc/guides/cryptodevs/qat.rst          | 1 +
 2 files changed, 4 insertions(+)

diff --git a/doc/guides/cryptodevs/features/qat.ini b/doc/guides/cryptodevs/features/qat.ini
index 40da8985f..eeaf7de4b 100644
--- a/doc/guides/cryptodevs/features/qat.ini
+++ b/doc/guides/cryptodevs/features/qat.ini
@@ -51,3 +51,6 @@ ZUC EIA3     = Y
 AES GCM (128) = Y
 AES GCM (192) = Y
 AES GCM (256) = Y
+AES CCM (128) = Y
+AES CCM (192) = Y
+AES CCM (256) = Y
diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst
index 581cd2f70..8418115b2 100644
--- a/doc/guides/cryptodevs/qat.rst
+++ b/doc/guides/cryptodevs/qat.rst
@@ -80,6 +80,7 @@ Hash algorithms:
 Supported AEAD algorithms:
 
 * ``RTE_CRYPTO_AEAD_AES_GCM``
+* ``RTE_CRYPTO_AEAD_AES_CCM``
 
 
 Limitations
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.158520368 -0800
+++ 0005-doc-fix-missing-CCM-to-QAT-feature-list.patch	2019-01-11 02:29:10.697973000 -0800
@@ -1,12 +1,13 @@
-From 7bd6f76ee678ec6aa81cb53562f852a43e842718 Mon Sep 17 00:00:00 2001
+From 916081d82ed4e9a8b3f2ced9bcd0d798dd114bb7 Mon Sep 17 00:00:00 2001
 From: Tomasz Cel <tomaszx.cel@intel.com>
 Date: Wed, 19 Sep 2018 08:27:18 +0200
 Subject: [PATCH] doc: fix missing CCM to QAT feature list
 
+[ upstream commit 7bd6f76ee678ec6aa81cb53562f852a43e842718 ]
+
 Update the QAT documentation to show that it supports CCM.
 
 Fixes: ab56c4d9ed9a ("crypto/qat: support AES-CCM")
-Cc: stable@dpdk.org
 
 Signed-off-by: Tomasz Cel <tomaszx.cel@intel.com>
 Acked-by: Fiona Trahe <fiona.trahe@intel.com>
@@ -17,10 +18,10 @@
  2 files changed, 4 insertions(+)
 
 diff --git a/doc/guides/cryptodevs/features/qat.ini b/doc/guides/cryptodevs/features/qat.ini
-index 29d865e07..220291b2c 100644
+index 40da8985f..eeaf7de4b 100644
 --- a/doc/guides/cryptodevs/features/qat.ini
 +++ b/doc/guides/cryptodevs/features/qat.ini
-@@ -56,3 +56,6 @@ ZUC EIA3     = Y
+@@ -51,3 +51,6 @@ ZUC EIA3     = Y
  AES GCM (128) = Y
  AES GCM (192) = Y
  AES GCM (256) = Y
@@ -28,10 +29,10 @@
 +AES CCM (192) = Y
 +AES CCM (256) = Y
 diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst
-index af1079918..b09624f2c 100644
+index 581cd2f70..8418115b2 100644
 --- a/doc/guides/cryptodevs/qat.rst
 +++ b/doc/guides/cryptodevs/qat.rst
-@@ -66,6 +66,7 @@ Hash algorithms:
+@@ -80,6 +80,7 @@ Hash algorithms:
  Supported AEAD algorithms:
  
  * ``RTE_CRYPTO_AEAD_AES_GCM``

[dpdk-stable] patch 'app/testpmd: check Rx VLAN offload flag to print VLAN TCI' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 434d9ec2786a878bc86c91466b83b22b3c7383aa Mon Sep 17 00:00:00 2001
From: Hyong Youb Kim <hyonkim@cisco.com>
Date: Tue, 25 Sep 2018 20:06:17 -0700
Subject: [PATCH] app/testpmd: check Rx VLAN offload flag to print VLAN TCI

[ upstream commit 597177163b851ae365f5c0113c448fae83370f99 ]

Since the following commit, PKT_RX_VLAN indicates the presence of
mbuf's vlan_tci, not PKT_RX_VLAN_STRIPPED.

Fixes: 380a7aab1ae2 ("mbuf: rename deprecated VLAN flags")

Signed-off-by: Hyong Youb Kim <hyonkim@cisco.com>
Reviewed-by: John Daley <johndale@cisco.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 app/test-pmd/rxonly.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test-pmd/rxonly.c b/app/test-pmd/rxonly.c
index fb6e8e33f..ea2a956c7 100644
--- a/app/test-pmd/rxonly.c
+++ b/app/test-pmd/rxonly.c
@@ -159,7 +159,7 @@ pkt_burst_receive(struct fwd_stream *fs)
 		}
 		if (ol_flags & PKT_RX_TIMESTAMP)
 			printf(" - timestamp %"PRIu64" ", mb->timestamp);
-		if (ol_flags & PKT_RX_VLAN_STRIPPED)
+		if (ol_flags & PKT_RX_VLAN)
 			printf(" - VLAN tci=0x%x", mb->vlan_tci);
 		if (ol_flags & PKT_RX_QINQ_STRIPPED)
 			printf(" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x",
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.217100439 -0800
+++ 0006-app-testpmd-check-Rx-VLAN-offload-flag-to-print-VLAN.patch	2019-01-11 02:29:10.704975000 -0800
@@ -1,13 +1,14 @@
-From 597177163b851ae365f5c0113c448fae83370f99 Mon Sep 17 00:00:00 2001
+From 434d9ec2786a878bc86c91466b83b22b3c7383aa Mon Sep 17 00:00:00 2001
 From: Hyong Youb Kim <hyonkim@cisco.com>
 Date: Tue, 25 Sep 2018 20:06:17 -0700
 Subject: [PATCH] app/testpmd: check Rx VLAN offload flag to print VLAN TCI
 
+[ upstream commit 597177163b851ae365f5c0113c448fae83370f99 ]
+
 Since the following commit, PKT_RX_VLAN indicates the presence of
 mbuf's vlan_tci, not PKT_RX_VLAN_STRIPPED.
 
 Fixes: 380a7aab1ae2 ("mbuf: rename deprecated VLAN flags")
-Cc: stable@dpdk.org
 
 Signed-off-by: Hyong Youb Kim <hyonkim@cisco.com>
 Reviewed-by: John Daley <johndale@cisco.com>
@@ -17,10 +18,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/app/test-pmd/rxonly.c b/app/test-pmd/rxonly.c
-index a93d80612..e8d226624 100644
+index fb6e8e33f..ea2a956c7 100644
 --- a/app/test-pmd/rxonly.c
 +++ b/app/test-pmd/rxonly.c
-@@ -130,7 +130,7 @@ pkt_burst_receive(struct fwd_stream *fs)
+@@ -159,7 +159,7 @@ pkt_burst_receive(struct fwd_stream *fs)
  		}
  		if (ol_flags & PKT_RX_TIMESTAMP)
  			printf(" - timestamp %"PRIu64" ", mb->timestamp);

[dpdk-stable] patch 'doc: fix typos in the flow API guide' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 9cfb2de4c699594fe2add9b96128e1f2c75e03f0 Mon Sep 17 00:00:00 2001
From: Ilya Maximets <i.maximets@samsung.com>
Date: Wed, 26 Sep 2018 17:37:46 +0300
Subject: [PATCH] doc: fix typos in the flow API guide

[ upstream commit 293a649c639aa2b5fe15a9e180eb0b3fb566ff46 ]

Fixes: 3e0ceb9f17ff ("doc: add basic howto for flow API")

Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 doc/guides/howto/rte_flow.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/guides/howto/rte_flow.rst b/doc/guides/howto/rte_flow.rst
index 62cac45e6..cc55413f1 100644
--- a/doc/guides/howto/rte_flow.rst
+++ b/doc/guides/howto/rte_flow.rst
@@ -63,7 +63,7 @@ Code
   struct rte_flow_attr attr = { .ingress = 1 };
   struct rte_flow_item pattern[MAX_PATTERN_IN_FLOW];
   struct rte_flow_action actions[MAX_ACTIONS_IN_FLOW];
-  struct rte_flow_item_etc eth;
+  struct rte_flow_item_eth eth;
   struct rte_flow_item_vlan vlan;
   struct rte_flow_item_ipv4 ipv4;
   struct rte_flow *flow;
@@ -83,7 +83,7 @@ Code
   pattern[2].spec = &ipv4;
 
   /* end the pattern array */
-  pattern[3].type = RTE_FLOW_ITEM)TYPE_END;
+  pattern[3].type = RTE_FLOW_ITEM_TYPE_END;
 
   /* create the drop action */
   actions[0].type = RTE_FLOW_ACTION_TYPE_DROP;
@@ -158,7 +158,7 @@ Code
   struct rte_flow_attr attr = {.ingress = 1};
   struct rte_flow_item pattern[MAX_PATTERN_IN_FLOW];
   struct rte_flow_action actions[MAX_ACTIONS_IN_FLOW];
-  struct rte_flow_item_etc eth;
+  struct rte_flow_item_eth eth;
   struct rte_flow_item_vlan vlan;
   struct rte_flow_item_ipv4 ipv4;
   struct rte_flow_item_ipv4 ipv4_mask;
@@ -181,7 +181,7 @@ Code
   pattern[2].mask = &ipv4_mask;
 
   /* end the pattern array */
-  pattern[3].type = RTE_FLOW_ITEM)TYPE_END;
+  pattern[3].type = RTE_FLOW_ITEM_TYPE_END;
 
   /* create the drop action */
   actions[0].type = RTE_FLOW_ACTION_TYPE_DROP;
@@ -258,7 +258,7 @@ Code
   struct rte_flow_attr attr = { .ingress = 1 };
   struct rte_flow_item pattern[MAX_PATTERN_IN_FLOW];
   struct rte_flow_action actions[MAX_ACTIONS_IN_FLOW];
-  struct rte_flow_item_etc eth;
+  struct rte_flow_item_eth eth;
   struct rte_flow_item_vlan vlan;
   struct rte_flow_action_queue queue = { .index = 3 };
   struct rte_flow *flow;
@@ -274,7 +274,7 @@ Code
   pattern[1].spec = &vlan;
 
   /* end the pattern array */
-  pattern[2].type = RTE_FLOW_ITEM)TYPE_END;
+  pattern[2].type = RTE_FLOW_ITEM_TYPE_END;
 
   /* create the drop action */
   actions[0].type = RTE_FLOW_ACTION_TYPE_QUEUE;
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.270729220 -0800
+++ 0007-doc-fix-typos-in-the-flow-API-guide.patch	2019-01-11 02:29:10.714970000 -0800
@@ -1,10 +1,11 @@
-From 293a649c639aa2b5fe15a9e180eb0b3fb566ff46 Mon Sep 17 00:00:00 2001
+From 9cfb2de4c699594fe2add9b96128e1f2c75e03f0 Mon Sep 17 00:00:00 2001
 From: Ilya Maximets <i.maximets@samsung.com>
 Date: Wed, 26 Sep 2018 17:37:46 +0300
 Subject: [PATCH] doc: fix typos in the flow API guide
 
+[ upstream commit 293a649c639aa2b5fe15a9e180eb0b3fb566ff46 ]
+
 Fixes: 3e0ceb9f17ff ("doc: add basic howto for flow API")
-Cc: stable@dpdk.org
 
 Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
@@ -13,10 +14,10 @@
  1 file changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/doc/guides/howto/rte_flow.rst b/doc/guides/howto/rte_flow.rst
-index c71152161..6a8534d98 100644
+index 62cac45e6..cc55413f1 100644
 --- a/doc/guides/howto/rte_flow.rst
 +++ b/doc/guides/howto/rte_flow.rst
-@@ -35,7 +35,7 @@ Code
+@@ -63,7 +63,7 @@ Code
    struct rte_flow_attr attr = { .ingress = 1 };
    struct rte_flow_item pattern[MAX_PATTERN_IN_FLOW];
    struct rte_flow_action actions[MAX_ACTIONS_IN_FLOW];
@@ -25,7 +26,7 @@
    struct rte_flow_item_vlan vlan;
    struct rte_flow_item_ipv4 ipv4;
    struct rte_flow *flow;
-@@ -55,7 +55,7 @@ Code
+@@ -83,7 +83,7 @@ Code
    pattern[2].spec = &ipv4;
  
    /* end the pattern array */
@@ -34,7 +35,7 @@
  
    /* create the drop action */
    actions[0].type = RTE_FLOW_ACTION_TYPE_DROP;
-@@ -130,7 +130,7 @@ Code
+@@ -158,7 +158,7 @@ Code
    struct rte_flow_attr attr = {.ingress = 1};
    struct rte_flow_item pattern[MAX_PATTERN_IN_FLOW];
    struct rte_flow_action actions[MAX_ACTIONS_IN_FLOW];
@@ -43,7 +44,7 @@
    struct rte_flow_item_vlan vlan;
    struct rte_flow_item_ipv4 ipv4;
    struct rte_flow_item_ipv4 ipv4_mask;
-@@ -153,7 +153,7 @@ Code
+@@ -181,7 +181,7 @@ Code
    pattern[2].mask = &ipv4_mask;
  
    /* end the pattern array */
@@ -52,7 +53,7 @@
  
    /* create the drop action */
    actions[0].type = RTE_FLOW_ACTION_TYPE_DROP;
-@@ -230,7 +230,7 @@ Code
+@@ -258,7 +258,7 @@ Code
    struct rte_flow_attr attr = { .ingress = 1 };
    struct rte_flow_item pattern[MAX_PATTERN_IN_FLOW];
    struct rte_flow_action actions[MAX_ACTIONS_IN_FLOW];
@@ -61,14 +62,14 @@
    struct rte_flow_item_vlan vlan;
    struct rte_flow_action_queue queue = { .index = 3 };
    struct rte_flow *flow;
-@@ -246,7 +246,7 @@ Code
+@@ -274,7 +274,7 @@ Code
    pattern[1].spec = &vlan;
  
    /* end the pattern array */
 -  pattern[2].type = RTE_FLOW_ITEM)TYPE_END;
 +  pattern[2].type = RTE_FLOW_ITEM_TYPE_END;
  
-   /* create the queue action */
+   /* create the drop action */
    actions[0].type = RTE_FLOW_ACTION_TYPE_QUEUE;
 -- 
 2.11.0

[dpdk-stable] patch 'app/testpmd: fix metering and policing commands' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From fa593134885ea8c9627203dbac45c81b8d760a87 Mon Sep 17 00:00:00 2001
From: Jasvinder Singh <jasvinder.singh@intel.com>
Date: Mon, 1 Oct 2018 11:46:04 +0100
Subject: [PATCH] app/testpmd: fix metering and policing commands

[ upstream commit a0f367eb06be643f30ab38cd62026513d656438d ]

Fixes bad arguments error for cli commands related to adding meter
profile for srtcm_rfc2697, trtcm_rfc2698 and trtcm_rfc4115.

error log:
testpmd> add port meter profile trtcm_rfc2698 2 0 3125000000
3125000000 2500000 2500000
Bad arguments

Fixes: 30ffb4e67ee3 ("app/testpmd: add commands traffic metering and policing")

Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 app/test-pmd/cmdline_mtr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/test-pmd/cmdline_mtr.c b/app/test-pmd/cmdline_mtr.c
index d8d806d7d..fc8279ffa 100644
--- a/app/test-pmd/cmdline_mtr.c
+++ b/app/test-pmd/cmdline_mtr.c
@@ -192,9 +192,9 @@ cmdline_parse_inst_t cmd_add_port_meter_profile_srtcm = {
 		(void *)&cmd_add_port_meter_profile_srtcm_port,
 		(void *)&cmd_add_port_meter_profile_srtcm_meter,
 		(void *)&cmd_add_port_meter_profile_srtcm_profile,
+		(void *)&cmd_add_port_meter_profile_srtcm_srtcm_rfc2697,
 		(void *)&cmd_add_port_meter_profile_srtcm_port_id,
 		(void *)&cmd_add_port_meter_profile_srtcm_profile_id,
-		(void *)&cmd_add_port_meter_profile_srtcm_srtcm_rfc2697,
 		(void *)&cmd_add_port_meter_profile_srtcm_cir,
 		(void *)&cmd_add_port_meter_profile_srtcm_cbs,
 		(void *)&cmd_add_port_meter_profile_srtcm_ebs,
@@ -299,9 +299,9 @@ cmdline_parse_inst_t cmd_add_port_meter_profile_trtcm = {
 		(void *)&cmd_add_port_meter_profile_trtcm_port,
 		(void *)&cmd_add_port_meter_profile_trtcm_meter,
 		(void *)&cmd_add_port_meter_profile_trtcm_profile,
+		(void *)&cmd_add_port_meter_profile_trtcm_trtcm_rfc2698,
 		(void *)&cmd_add_port_meter_profile_trtcm_port_id,
 		(void *)&cmd_add_port_meter_profile_trtcm_profile_id,
-		(void *)&cmd_add_port_meter_profile_trtcm_trtcm_rfc2698,
 		(void *)&cmd_add_port_meter_profile_trtcm_cir,
 		(void *)&cmd_add_port_meter_profile_trtcm_pir,
 		(void *)&cmd_add_port_meter_profile_trtcm_cbs,
@@ -411,9 +411,9 @@ cmdline_parse_inst_t cmd_add_port_meter_profile_trtcm_rfc4115 = {
 		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_port,
 		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_meter,
 		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_profile,
+		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_trtcm_rfc4115,
 		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_port_id,
 		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_profile_id,
-		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_trtcm_rfc4115,
 		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_cir,
 		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_eir,
 		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_cbs,
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.324709703 -0800
+++ 0008-app-testpmd-fix-metering-and-policing-commands.patch	2019-01-11 02:29:10.723971000 -0800
@@ -1,8 +1,10 @@
-From a0f367eb06be643f30ab38cd62026513d656438d Mon Sep 17 00:00:00 2001
+From fa593134885ea8c9627203dbac45c81b8d760a87 Mon Sep 17 00:00:00 2001
 From: Jasvinder Singh <jasvinder.singh@intel.com>
 Date: Mon, 1 Oct 2018 11:46:04 +0100
 Subject: [PATCH] app/testpmd: fix metering and policing commands
 
+[ upstream commit a0f367eb06be643f30ab38cd62026513d656438d ]
+
 Fixes bad arguments error for cli commands related to adding meter
 profile for srtcm_rfc2697, trtcm_rfc2698 and trtcm_rfc4115.
 
@@ -12,7 +14,6 @@
 Bad arguments
 
 Fixes: 30ffb4e67ee3 ("app/testpmd: add commands traffic metering and policing")
-Cc: stable@dpdk.org
 
 Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
 Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
@@ -21,10 +22,10 @@
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/app/test-pmd/cmdline_mtr.c b/app/test-pmd/cmdline_mtr.c
-index f908fb352..32a47305f 100644
+index d8d806d7d..fc8279ffa 100644
 --- a/app/test-pmd/cmdline_mtr.c
 +++ b/app/test-pmd/cmdline_mtr.c
-@@ -414,9 +414,9 @@ cmdline_parse_inst_t cmd_add_port_meter_profile_srtcm = {
+@@ -192,9 +192,9 @@ cmdline_parse_inst_t cmd_add_port_meter_profile_srtcm = {
  		(void *)&cmd_add_port_meter_profile_srtcm_port,
  		(void *)&cmd_add_port_meter_profile_srtcm_meter,
  		(void *)&cmd_add_port_meter_profile_srtcm_profile,
@@ -35,7 +36,7 @@
  		(void *)&cmd_add_port_meter_profile_srtcm_cir,
  		(void *)&cmd_add_port_meter_profile_srtcm_cbs,
  		(void *)&cmd_add_port_meter_profile_srtcm_ebs,
-@@ -521,9 +521,9 @@ cmdline_parse_inst_t cmd_add_port_meter_profile_trtcm = {
+@@ -299,9 +299,9 @@ cmdline_parse_inst_t cmd_add_port_meter_profile_trtcm = {
  		(void *)&cmd_add_port_meter_profile_trtcm_port,
  		(void *)&cmd_add_port_meter_profile_trtcm_meter,
  		(void *)&cmd_add_port_meter_profile_trtcm_profile,
@@ -46,7 +47,7 @@
  		(void *)&cmd_add_port_meter_profile_trtcm_cir,
  		(void *)&cmd_add_port_meter_profile_trtcm_pir,
  		(void *)&cmd_add_port_meter_profile_trtcm_cbs,
-@@ -633,9 +633,9 @@ cmdline_parse_inst_t cmd_add_port_meter_profile_trtcm_rfc4115 = {
+@@ -411,9 +411,9 @@ cmdline_parse_inst_t cmd_add_port_meter_profile_trtcm_rfc4115 = {
  		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_port,
  		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_meter,
  		(void *)&cmd_add_port_meter_profile_trtcm_rfc4115_profile,

[dpdk-stable] patch 'net/virtio: fix PCI config error handling' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 6869fbea3d74b7e68c0a3dbd525e598e54afa07f Mon Sep 17 00:00:00 2001
From: Brian Russell <brussell@brocade.com>
Date: Tue, 28 Aug 2018 11:12:40 +0100
Subject: [PATCH] net/virtio: fix PCI config error handling

[ upstream commit 49bb1f7a0ab760a0f1fb39e27c90a1cb2ad42edd ]

In virtio_read_caps and vtpci_msix_detect, rte_pci_read_config returns
the number of bytes read from PCI config or < 0 on error.
If less than the expected number of bytes are read then log the
failure and return rather than carrying on with garbage.

Fixes: 6ba1f63b5ab0 ("virtio: support specification 1.0")

Signed-off-by: Brian Russell <brussell@brocade.com>
Signed-off-by: Luca Boccassi <bluca@debian.org>
Reviewed-by: Tiwei Bie <tiwei.bie@intel.com>
---
 drivers/net/virtio/virtio_pci.c | 65 ++++++++++++++++++++++++++++++-----------
 1 file changed, 48 insertions(+), 17 deletions(-)

diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
index 9574498fb..89986c335 100644
--- a/drivers/net/virtio/virtio_pci.c
+++ b/drivers/net/virtio/virtio_pci.c
@@ -596,16 +596,18 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw)
 	}
 
 	ret = rte_pci_read_config(dev, &pos, 1, PCI_CAPABILITY_LIST);
-	if (ret < 0) {
-		PMD_INIT_LOG(DEBUG, "failed to read pci capability list");
+	if (ret != 1) {
+		PMD_INIT_LOG(DEBUG,
+			     "failed to read pci capability list, ret %d", ret);
 		return -1;
 	}
 
 	while (pos) {
-		ret = rte_pci_read_config(dev, &cap, sizeof(cap), pos);
-		if (ret < 0) {
-			PMD_INIT_LOG(ERR,
-				"failed to read pci cap at pos: %x", pos);
+		ret = rte_pci_read_config(dev, &cap, 2, pos);
+		if (ret != 2) {
+			PMD_INIT_LOG(DEBUG,
+				     "failed to read pci cap at pos: %x ret %d",
+				     pos, ret);
 			break;
 		}
 
@@ -615,7 +617,16 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw)
 			 * 1st byte is cap ID; 2nd byte is the position of next
 			 * cap; next two bytes are the flags.
 			 */
-			uint16_t flags = ((uint16_t *)&cap)[1];
+			uint16_t flags;
+
+			ret = rte_pci_read_config(dev, &flags, sizeof(flags),
+					pos + 2);
+			if (ret != sizeof(flags)) {
+				PMD_INIT_LOG(DEBUG,
+					     "failed to read pci cap at pos:"
+					     " %x ret %d", pos + 2, ret);
+				break;
+			}
 
 			if (flags & PCI_MSIX_ENABLE)
 				hw->use_msix = VIRTIO_MSIX_ENABLED;
@@ -630,6 +641,14 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw)
 			goto next;
 		}
 
+		ret = rte_pci_read_config(dev, &cap, sizeof(cap), pos);
+		if (ret != sizeof(cap)) {
+			PMD_INIT_LOG(DEBUG,
+				     "failed to read pci cap at pos: %x ret %d",
+				     pos, ret);
+			break;
+		}
+
 		PMD_INIT_LOG(DEBUG,
 			"[%2x] cfg type: %u, bar: %u, offset: %04x, len: %u",
 			pos, cap.cfg_type, cap.bar, cap.offset, cap.length);
@@ -718,25 +737,37 @@ enum virtio_msix_status
 vtpci_msix_detect(struct rte_pci_device *dev)
 {
 	uint8_t pos;
-	struct virtio_pci_cap cap;
 	int ret;
 
 	ret = rte_pci_read_config(dev, &pos, 1, PCI_CAPABILITY_LIST);
-	if (ret < 0) {
-		PMD_INIT_LOG(DEBUG, "failed to read pci capability list");
+	if (ret != 1) {
+		PMD_INIT_LOG(DEBUG,
+			     "failed to read pci capability list, ret %d", ret);
 		return VIRTIO_MSIX_NONE;
 	}
 
 	while (pos) {
-		ret = rte_pci_read_config(dev, &cap, sizeof(cap), pos);
-		if (ret < 0) {
-			PMD_INIT_LOG(ERR,
-				"failed to read pci cap at pos: %x", pos);
+		uint8_t cap[2];
+
+		ret = rte_pci_read_config(dev, cap, sizeof(cap), pos);
+		if (ret != sizeof(cap)) {
+			PMD_INIT_LOG(DEBUG,
+				     "failed to read pci cap at pos: %x ret %d",
+				     pos, ret);
 			break;
 		}
 
-		if (cap.cap_vndr == PCI_CAP_ID_MSIX) {
-			uint16_t flags = ((uint16_t *)&cap)[1];
+		if (cap[0] == PCI_CAP_ID_MSIX) {
+			uint16_t flags;
+
+			ret = rte_pci_read_config(dev, &flags, sizeof(flags),
+					pos + sizeof(cap));
+			if (ret != sizeof(flags)) {
+				PMD_INIT_LOG(DEBUG,
+					     "failed to read pci cap at pos:"
+					     " %x ret %d", pos + 2, ret);
+				break;
+			}
 
 			if (flags & PCI_MSIX_ENABLE)
 				return VIRTIO_MSIX_ENABLED;
@@ -744,7 +775,7 @@ vtpci_msix_detect(struct rte_pci_device *dev)
 				return VIRTIO_MSIX_DISABLED;
 		}
 
-		pos = cap.cap_next;
+		pos = cap[1];
 	}
 
 	return VIRTIO_MSIX_NONE;
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.376649834 -0800
+++ 0009-net-virtio-fix-PCI-config-error-handling.patch	2019-01-11 02:29:10.731973000 -0800
@@ -1,15 +1,16 @@
-From 49bb1f7a0ab760a0f1fb39e27c90a1cb2ad42edd Mon Sep 17 00:00:00 2001
+From 6869fbea3d74b7e68c0a3dbd525e598e54afa07f Mon Sep 17 00:00:00 2001
 From: Brian Russell <brussell@brocade.com>
 Date: Tue, 28 Aug 2018 11:12:40 +0100
 Subject: [PATCH] net/virtio: fix PCI config error handling
 
+[ upstream commit 49bb1f7a0ab760a0f1fb39e27c90a1cb2ad42edd ]
+
 In virtio_read_caps and vtpci_msix_detect, rte_pci_read_config returns
 the number of bytes read from PCI config or < 0 on error.
 If less than the expected number of bytes are read then log the
 failure and return rather than carrying on with garbage.
 
 Fixes: 6ba1f63b5ab0 ("virtio: support specification 1.0")
-Cc: stable@dpdk.org
 
 Signed-off-by: Brian Russell <brussell@brocade.com>
 Signed-off-by: Luca Boccassi <bluca@debian.org>
@@ -19,10 +20,10 @@
  1 file changed, 48 insertions(+), 17 deletions(-)
 
 diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
-index 6bd22e54a..b6a3c80b4 100644
+index 9574498fb..89986c335 100644
 --- a/drivers/net/virtio/virtio_pci.c
 +++ b/drivers/net/virtio/virtio_pci.c
-@@ -567,16 +567,18 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw)
+@@ -596,16 +596,18 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw)
  	}
  
  	ret = rte_pci_read_config(dev, &pos, 1, PCI_CAPABILITY_LIST);
@@ -47,7 +48,7 @@
  			break;
  		}
  
-@@ -586,7 +588,16 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw)
+@@ -615,7 +617,16 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw)
  			 * 1st byte is cap ID; 2nd byte is the position of next
  			 * cap; next two bytes are the flags.
  			 */
@@ -65,7 +66,7 @@
  
  			if (flags & PCI_MSIX_ENABLE)
  				hw->use_msix = VIRTIO_MSIX_ENABLED;
-@@ -601,6 +612,14 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw)
+@@ -630,6 +641,14 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw)
  			goto next;
  		}
  
@@ -80,7 +81,7 @@
  		PMD_INIT_LOG(DEBUG,
  			"[%2x] cfg type: %u, bar: %u, offset: %04x, len: %u",
  			pos, cap.cfg_type, cap.bar, cap.offset, cap.length);
-@@ -689,25 +708,37 @@ enum virtio_msix_status
+@@ -718,25 +737,37 @@ enum virtio_msix_status
  vtpci_msix_detect(struct rte_pci_device *dev)
  {
  	uint8_t pos;
@@ -127,7 +128,7 @@
  
  			if (flags & PCI_MSIX_ENABLE)
  				return VIRTIO_MSIX_ENABLED;
-@@ -715,7 +746,7 @@ vtpci_msix_detect(struct rte_pci_device *dev)
+@@ -744,7 +775,7 @@ vtpci_msix_detect(struct rte_pci_device *dev)
  				return VIRTIO_MSIX_DISABLED;
  		}
  

[dpdk-stable] patch 'bus/dpaa: fix build with gcc 9.0' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From ea44f4c81017449bbc9cfec7eb0e94387a789750 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Fri, 2 Nov 2018 19:06:05 +0000
Subject: [PATCH] bus/dpaa: fix build with gcc 9.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 74f277101265ff3376c65270da2dcbc6d1325494 ]

build error:
In function ‘fman_if_init’,
    .../drivers/bus/dpaa/base/fman/fman.c:186:2:
    error: ‘strncpy’ output may be truncated copying 4095 bytes from a
           string of length 4095 [-Werror=stringop-truncation]
    strncpy(__if->node_path, dpa_node->full_name, PATH_MAX - 1);

strncpy may result a not null-terminated string,
replaced it with strlcpy

Fixes: 5b22cf744689 ("bus/dpaa: introducing FMan configurations")

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 drivers/bus/dpaa/base/fman/fman.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/bus/dpaa/base/fman/fman.c b/drivers/bus/dpaa/base/fman/fman.c
index a9c88ddcb..4403ff5de 100644
--- a/drivers/bus/dpaa/base/fman/fman.c
+++ b/drivers/bus/dpaa/base/fman/fman.c
@@ -46,6 +46,7 @@
 #include <fman.h>
 #include <of.h>
 #include <rte_dpaa_logs.h>
+#include <rte_string_fns.h>
 
 #define QMI_PORT_REGS_OFFSET		0x400
 
@@ -216,7 +217,7 @@ fman_if_init(const struct device_node *dpa_node)
 	}
 	memset(__if, 0, sizeof(*__if));
 	INIT_LIST_HEAD(&__if->__if.bpool_list);
-	strncpy(__if->node_path, dpa_node->full_name, PATH_MAX - 1);
+	strlcpy(__if->node_path, dpa_node->full_name, PATH_MAX - 1);
 	__if->node_path[PATH_MAX - 1] = '\0';
 
 	/* Obtain the MAC node used by this interface except macless */
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.432076253 -0800
+++ 0010-bus-dpaa-fix-build-with-gcc-9.0.patch	2019-01-11 02:29:10.747974000 -0800
@@ -1,4 +1,4 @@
-From 74f277101265ff3376c65270da2dcbc6d1325494 Mon Sep 17 00:00:00 2001
+From ea44f4c81017449bbc9cfec7eb0e94387a789750 Mon Sep 17 00:00:00 2001
 From: Ferruh Yigit <ferruh.yigit@intel.com>
 Date: Fri, 2 Nov 2018 19:06:05 +0000
 Subject: [PATCH] bus/dpaa: fix build with gcc 9.0
@@ -6,6 +6,8 @@
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+[ upstream commit 74f277101265ff3376c65270da2dcbc6d1325494 ]
+
 build error:
 In function ‘fman_if_init’,
     .../drivers/bus/dpaa/base/fman/fman.c:186:2:
@@ -17,7 +19,6 @@
 replaced it with strlcpy
 
 Fixes: 5b22cf744689 ("bus/dpaa: introducing FMan configurations")
-Cc: stable@dpdk.org
 
 Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
 ---
@@ -25,10 +26,10 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/bus/dpaa/base/fman/fman.c b/drivers/bus/dpaa/base/fman/fman.c
-index bdb700423..06762e0f4 100644
+index a9c88ddcb..4403ff5de 100644
 --- a/drivers/bus/dpaa/base/fman/fman.c
 +++ b/drivers/bus/dpaa/base/fman/fman.c
-@@ -13,6 +13,7 @@
+@@ -46,6 +46,7 @@
  #include <fman.h>
  #include <of.h>
  #include <rte_dpaa_logs.h>
@@ -36,7 +37,7 @@
  
  #define QMI_PORT_REGS_OFFSET		0x400
  
-@@ -183,7 +184,7 @@ fman_if_init(const struct device_node *dpa_node)
+@@ -216,7 +217,7 @@ fman_if_init(const struct device_node *dpa_node)
  	}
  	memset(__if, 0, sizeof(*__if));
  	INIT_LIST_HEAD(&__if->__if.bpool_list);

[dpdk-stable] patch 'app/testpmd: fix RED byte stats' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From b79e7b56f6fd695a121b8b7517ae7fafb34d65c5 Mon Sep 17 00:00:00 2001
From: Leah Tekoa <leah@ethernitynet.com>
Date: Thu, 25 Oct 2018 06:05:14 +0000
Subject: [PATCH] app/testpmd: fix RED byte stats

[ upstream commit 930a030d2afbd46b7a446305c9c9ae16a5a3b099 ]

Y stands for Yellow, R stands for Red.

Fixes: 30ffb4e67ee3 ("app/testpmd: add commands traffic metering and policing")

Signed-off-by: Leah Tekoa <leah@ethernitynet.com>
---
 app/test-pmd/cmdline_mtr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test-pmd/cmdline_mtr.c b/app/test-pmd/cmdline_mtr.c
index fc8279ffa..9666789bd 100644
--- a/app/test-pmd/cmdline_mtr.c
+++ b/app/test-pmd/cmdline_mtr.c
@@ -991,7 +991,7 @@ static void cmd_show_port_meter_stats_parsed(void *parsed_result,
 		printf("\tPkts R: %" PRIu64 "\n",
 			stats.n_pkts[RTE_MTR_RED]);
 	if (stats_mask & RTE_MTR_STATS_N_BYTES_RED)
-		printf("\tBytes Y: %" PRIu64 "\n",
+		printf("\tBytes R: %" PRIu64 "\n",
 			stats.n_bytes[RTE_MTR_RED]);
 	if (stats_mask & RTE_MTR_STATS_N_PKTS_DROPPED)
 		printf("\tPkts DROPPED: %" PRIu64 "\n",
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.485983164 -0800
+++ 0011-app-testpmd-fix-RED-byte-stats.patch	2019-01-11 02:29:10.756982000 -0800
@@ -1,12 +1,13 @@
-From 930a030d2afbd46b7a446305c9c9ae16a5a3b099 Mon Sep 17 00:00:00 2001
+From b79e7b56f6fd695a121b8b7517ae7fafb34d65c5 Mon Sep 17 00:00:00 2001
 From: Leah Tekoa <leah@ethernitynet.com>
 Date: Thu, 25 Oct 2018 06:05:14 +0000
 Subject: [PATCH] app/testpmd: fix RED byte stats
 
+[ upstream commit 930a030d2afbd46b7a446305c9c9ae16a5a3b099 ]
+
 Y stands for Yellow, R stands for Red.
 
 Fixes: 30ffb4e67ee3 ("app/testpmd: add commands traffic metering and policing")
-Cc: stable@dpdk.org
 
 Signed-off-by: Leah Tekoa <leah@ethernitynet.com>
 ---
@@ -14,10 +15,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/app/test-pmd/cmdline_mtr.c b/app/test-pmd/cmdline_mtr.c
-index 32a47305f..63f32828f 100644
+index fc8279ffa..9666789bd 100644
 --- a/app/test-pmd/cmdline_mtr.c
 +++ b/app/test-pmd/cmdline_mtr.c
-@@ -1440,7 +1440,7 @@ static void cmd_show_port_meter_stats_parsed(void *parsed_result,
+@@ -991,7 +991,7 @@ static void cmd_show_port_meter_stats_parsed(void *parsed_result,
  		printf("\tPkts R: %" PRIu64 "\n",
  			stats.n_pkts[RTE_MTR_RED]);
  	if (stats_mask & RTE_MTR_STATS_N_BYTES_RED)

[dpdk-stable] patch 'examples/flow_filtering: remove VLAN item' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From e12ff9920d806030612933890c0c2441b2b11724 Mon Sep 17 00:00:00 2001
From: Ori Kam <orika@mellanox.com>
Date: Mon, 5 Nov 2018 09:35:28 +0000
Subject: [PATCH] examples/flow_filtering: remove VLAN item

[ upstream commit 9af4eb5657107b05b0e06141291b7c6e6162bb36 ]

Since the VLAN is not in use and some PMD can't support vlan = 0
this item was removed.

Fixes: 4a3ef59a10c8 ("examples/flow_filtering: add simple demo of flow API")

Signed-off-by: Ori Kam <orika@mellanox.com>
---
 examples/flow_filtering/flow_blocks.c | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/examples/flow_filtering/flow_blocks.c b/examples/flow_filtering/flow_blocks.c
index f92df1024..b71a42ff0 100644
--- a/examples/flow_filtering/flow_blocks.c
+++ b/examples/flow_filtering/flow_blocks.c
@@ -74,8 +74,6 @@ generate_ipv4_flow(uint8_t port_id, uint16_t rx_q,
 	struct rte_flow_action_queue queue = { .index = rx_q };
 	struct rte_flow_item_eth eth_spec;
 	struct rte_flow_item_eth eth_mask;
-	struct rte_flow_item_vlan vlan_spec;
-	struct rte_flow_item_vlan vlan_mask;
 	struct rte_flow_item_ipv4 ip_spec;
 	struct rte_flow_item_ipv4 ip_mask;
 	int res;
@@ -113,17 +111,6 @@ generate_ipv4_flow(uint8_t port_id, uint16_t rx_q,
 	pattern[0].mask = &eth_mask;
 
 	/*
-	 * setting the second level of the pattern (vlan).
-	 * since in this example we just want to get the
-	 * ipv4 we also set this level to allow all.
-	 */
-	memset(&vlan_spec, 0, sizeof(struct rte_flow_item_vlan));
-	memset(&vlan_mask, 0, sizeof(struct rte_flow_item_vlan));
-	pattern[1].type = RTE_FLOW_ITEM_TYPE_VLAN;
-	pattern[1].spec = &vlan_spec;
-	pattern[1].mask = &vlan_mask;
-
-	/*
 	 * setting the third level of the pattern (ip).
 	 * in this example this is the level we care about
 	 * so we set it according to the parameters.
@@ -134,12 +121,12 @@ generate_ipv4_flow(uint8_t port_id, uint16_t rx_q,
 	ip_mask.hdr.dst_addr = dest_mask;
 	ip_spec.hdr.src_addr = htonl(src_ip);
 	ip_mask.hdr.src_addr = src_mask;
-	pattern[2].type = RTE_FLOW_ITEM_TYPE_IPV4;
-	pattern[2].spec = &ip_spec;
-	pattern[2].mask = &ip_mask;
+	pattern[1].type = RTE_FLOW_ITEM_TYPE_IPV4;
+	pattern[1].spec = &ip_spec;
+	pattern[1].mask = &ip_mask;
 
 	/* the final level must be always type end */
-	pattern[3].type = RTE_FLOW_ITEM_TYPE_END;
+	pattern[2].type = RTE_FLOW_ITEM_TYPE_END;
 
 	res = rte_flow_validate(port_id, &attr, pattern, action, error);
 	if (!res)
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.539814726 -0800
+++ 0012-examples-flow_filtering-remove-VLAN-item.patch	2019-01-11 02:29:10.764974000 -0800
@@ -1,13 +1,14 @@
-From 9af4eb5657107b05b0e06141291b7c6e6162bb36 Mon Sep 17 00:00:00 2001
+From e12ff9920d806030612933890c0c2441b2b11724 Mon Sep 17 00:00:00 2001
 From: Ori Kam <orika@mellanox.com>
 Date: Mon, 5 Nov 2018 09:35:28 +0000
 Subject: [PATCH] examples/flow_filtering: remove VLAN item
 
+[ upstream commit 9af4eb5657107b05b0e06141291b7c6e6162bb36 ]
+
 Since the VLAN is not in use and some PMD can't support vlan = 0
 this item was removed.
 
 Fixes: 4a3ef59a10c8 ("examples/flow_filtering: add simple demo of flow API")
-Cc: stable@dpdk.org
 
 Signed-off-by: Ori Kam <orika@mellanox.com>
 ---
@@ -15,10 +16,10 @@
  1 file changed, 4 insertions(+), 17 deletions(-)
 
 diff --git a/examples/flow_filtering/flow_blocks.c b/examples/flow_filtering/flow_blocks.c
-index 4da459285..bae711699 100644
+index f92df1024..b71a42ff0 100644
 --- a/examples/flow_filtering/flow_blocks.c
 +++ b/examples/flow_filtering/flow_blocks.c
-@@ -46,8 +46,6 @@ generate_ipv4_flow(uint16_t port_id, uint16_t rx_q,
+@@ -74,8 +74,6 @@ generate_ipv4_flow(uint8_t port_id, uint16_t rx_q,
  	struct rte_flow_action_queue queue = { .index = rx_q };
  	struct rte_flow_item_eth eth_spec;
  	struct rte_flow_item_eth eth_mask;
@@ -27,7 +28,7 @@
  	struct rte_flow_item_ipv4 ip_spec;
  	struct rte_flow_item_ipv4 ip_mask;
  	int res;
-@@ -85,17 +83,6 @@ generate_ipv4_flow(uint16_t port_id, uint16_t rx_q,
+@@ -113,17 +111,6 @@ generate_ipv4_flow(uint8_t port_id, uint16_t rx_q,
  	pattern[0].mask = &eth_mask;
  
  	/*
@@ -45,7 +46,7 @@
  	 * setting the third level of the pattern (ip).
  	 * in this example this is the level we care about
  	 * so we set it according to the parameters.
-@@ -106,12 +93,12 @@ generate_ipv4_flow(uint16_t port_id, uint16_t rx_q,
+@@ -134,12 +121,12 @@ generate_ipv4_flow(uint8_t port_id, uint16_t rx_q,
  	ip_mask.hdr.dst_addr = dest_mask;
  	ip_spec.hdr.src_addr = htonl(src_ip);
  	ip_mask.hdr.src_addr = src_mask;

[dpdk-stable] patch 'net/virtio: fix unchecked return value' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 5fe500e3ddf31001d113b8937ae4f5cf1f2ec55d Mon Sep 17 00:00:00 2001
From: Tiwei Bie <tiwei.bie@intel.com>
Date: Wed, 7 Nov 2018 17:01:01 +0800
Subject: [PATCH] net/virtio: fix unchecked return value

[ upstream commit ecfae1510edc1391285aa566a2d31e7eae8fc6d2 ]

Coverity issue: 302861
Fixes: 6ba1f63b5ab0 ("virtio: support specification 1.0")

Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
 drivers/net/virtio/virtio_pci.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
index 89986c335..249ec6d3a 100644
--- a/drivers/net/virtio/virtio_pci.c
+++ b/drivers/net/virtio/virtio_pci.c
@@ -658,9 +658,15 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw)
 			hw->common_cfg = get_cfg_addr(dev, &cap);
 			break;
 		case VIRTIO_PCI_CAP_NOTIFY_CFG:
-			rte_pci_read_config(dev, &hw->notify_off_multiplier,
+			ret = rte_pci_read_config(dev,
+					&hw->notify_off_multiplier,
 					4, pos + sizeof(cap));
-			hw->notify_base = get_cfg_addr(dev, &cap);
+			if (ret != 4)
+				PMD_INIT_LOG(DEBUG,
+					"failed to read notify_off_multiplier, ret %d",
+					ret);
+			else
+				hw->notify_base = get_cfg_addr(dev, &cap);
 			break;
 		case VIRTIO_PCI_CAP_DEVICE_CFG:
 			hw->dev_cfg = get_cfg_addr(dev, &cap);
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.594925472 -0800
+++ 0013-net-virtio-fix-unchecked-return-value.patch	2019-01-11 02:29:10.775983000 -0800
@@ -1,11 +1,12 @@
-From ecfae1510edc1391285aa566a2d31e7eae8fc6d2 Mon Sep 17 00:00:00 2001
+From 5fe500e3ddf31001d113b8937ae4f5cf1f2ec55d Mon Sep 17 00:00:00 2001
 From: Tiwei Bie <tiwei.bie@intel.com>
 Date: Wed, 7 Nov 2018 17:01:01 +0800
 Subject: [PATCH] net/virtio: fix unchecked return value
 
+[ upstream commit ecfae1510edc1391285aa566a2d31e7eae8fc6d2 ]
+
 Coverity issue: 302861
 Fixes: 6ba1f63b5ab0 ("virtio: support specification 1.0")
-Cc: stable@dpdk.org
 
 Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
 Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
@@ -14,10 +15,10 @@
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c
-index 21110cd69..c8883c32e 100644
+index 89986c335..249ec6d3a 100644
 --- a/drivers/net/virtio/virtio_pci.c
 +++ b/drivers/net/virtio/virtio_pci.c
-@@ -614,9 +614,15 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw)
+@@ -658,9 +658,15 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw)
  			hw->common_cfg = get_cfg_addr(dev, &cap);
  			break;
  		case VIRTIO_PCI_CAP_NOTIFY_CFG:

[dpdk-stable] patch 'net/octeontx: fix mbuf corruption with large private sizes' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From addbf8ef5ea9d8595b9c5ea9f6e993d82e03d701 Mon Sep 17 00:00:00 2001
From: Nitin Saxena <nitin.saxena@caviumnetworks.com>
Date: Mon, 12 Nov 2018 17:54:09 +0000
Subject: [PATCH] net/octeontx: fix mbuf corruption with large private sizes

[ upstream commit 679dfdc96ef9ae0b1a54098fc19986f93621c8cb ]

When the priv_size of the mbuf is > 128 bytes, the mbuf would not be
properly constructed. This would lead to a corrupt mbuf.

This patch fixes the issue by accounting for
rte_pktmbuf_priv_size(pool) and RTE_PKTMBUF_HEADROOM
while configuring first skip register calculation.

Fixes: 197438ee9f18 ("net/octeontx: add Rx queue setup and release ops")

Suggested-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
Signed-off-by: Anoob Joseph <anoob.joseph@caviumnetworks.com>
Signed-off-by: Nitin Saxena <nitin.saxena@caviumnetworks.com>
Acked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
---
 drivers/net/octeontx/base/octeontx_pki_var.h | 13 +++++++++++--
 drivers/net/octeontx/octeontx_ethdev.c       |  3 ++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/net/octeontx/base/octeontx_pki_var.h b/drivers/net/octeontx/base/octeontx_pki_var.h
index def6cbb96..41b44606b 100644
--- a/drivers/net/octeontx/base/octeontx_pki_var.h
+++ b/drivers/net/octeontx/base/octeontx_pki_var.h
@@ -35,8 +35,17 @@
 
 #include <rte_byteorder.h>
 
-#define OCTTX_PACKET_WQE_SKIP		128
-#define OCTTX_PACKET_FIRST_SKIP		240
+#define OCTTX_PACKET_WQE_SKIP			128
+#define OCTTX_PACKET_FIRST_SKIP_MAXREGVAL	496
+#define OCTTX_PACKET_FIRST_SKIP_MAXLEN		512
+#define OCTTX_PACKET_FIRST_SKIP_ADJUST(x)				\
+		(RTE_MIN(x, OCTTX_PACKET_FIRST_SKIP_MAXREGVAL))
+#define OCTTX_PACKET_FIRST_SKIP_SUM(p)					\
+				(OCTTX_PACKET_WQE_SKIP			\
+				+ rte_pktmbuf_priv_size(p)		\
+				+ RTE_PKTMBUF_HEADROOM)
+#define OCTTX_PACKET_FIRST_SKIP(p)					\
+	OCTTX_PACKET_FIRST_SKIP_ADJUST(OCTTX_PACKET_FIRST_SKIP_SUM(p))
 #define OCTTX_PACKET_LATER_SKIP		128
 
 /* WQE descriptor */
diff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c
index 13dfbbc04..830fc8471 100644
--- a/drivers/net/octeontx/octeontx_ethdev.c
+++ b/drivers/net/octeontx/octeontx_ethdev.c
@@ -892,10 +892,11 @@ octeontx_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
 		pktbuf_conf.mmask.f_cache_mode = 1;
 
 		pktbuf_conf.wqe_skip = OCTTX_PACKET_WQE_SKIP;
-		pktbuf_conf.first_skip = OCTTX_PACKET_FIRST_SKIP;
+		pktbuf_conf.first_skip = OCTTX_PACKET_FIRST_SKIP(mb_pool);
 		pktbuf_conf.later_skip = OCTTX_PACKET_LATER_SKIP;
 		pktbuf_conf.mbuff_size = (mb_pool->elt_size -
 					RTE_PKTMBUF_HEADROOM -
+					rte_pktmbuf_priv_size(mb_pool) -
 					sizeof(struct rte_mbuf));
 
 		pktbuf_conf.cache_mode = PKI_OPC_MODE_STF2_STT;
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.648232452 -0800
+++ 0014-net-octeontx-fix-mbuf-corruption-with-large-private-.patch	2019-01-11 02:29:10.790974000 -0800
@@ -1,8 +1,10 @@
-From 679dfdc96ef9ae0b1a54098fc19986f93621c8cb Mon Sep 17 00:00:00 2001
+From addbf8ef5ea9d8595b9c5ea9f6e993d82e03d701 Mon Sep 17 00:00:00 2001
 From: Nitin Saxena <nitin.saxena@caviumnetworks.com>
 Date: Mon, 12 Nov 2018 17:54:09 +0000
 Subject: [PATCH] net/octeontx: fix mbuf corruption with large private sizes
 
+[ upstream commit 679dfdc96ef9ae0b1a54098fc19986f93621c8cb ]
+
 When the priv_size of the mbuf is > 128 bytes, the mbuf would not be
 properly constructed. This would lead to a corrupt mbuf.
 
@@ -11,7 +13,6 @@
 while configuring first skip register calculation.
 
 Fixes: 197438ee9f18 ("net/octeontx: add Rx queue setup and release ops")
-Cc: stable@dpdk.org
 
 Suggested-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
 Signed-off-by: Anoob Joseph <anoob.joseph@caviumnetworks.com>
@@ -23,10 +24,10 @@
  2 files changed, 13 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/octeontx/base/octeontx_pki_var.h b/drivers/net/octeontx/base/octeontx_pki_var.h
-index c793b655a..f4661d24e 100644
+index def6cbb96..41b44606b 100644
 --- a/drivers/net/octeontx/base/octeontx_pki_var.h
 +++ b/drivers/net/octeontx/base/octeontx_pki_var.h
-@@ -7,8 +7,17 @@
+@@ -35,8 +35,17 @@
  
  #include <rte_byteorder.h>
  
@@ -47,10 +48,10 @@
  
  /* WQE descriptor */
 diff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c
-index 068148624..a3063be42 100644
+index 13dfbbc04..830fc8471 100644
 --- a/drivers/net/octeontx/octeontx_ethdev.c
 +++ b/drivers/net/octeontx/octeontx_ethdev.c
-@@ -844,10 +844,11 @@ octeontx_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
+@@ -892,10 +892,11 @@ octeontx_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t qidx,
  		pktbuf_conf.mmask.f_cache_mode = 1;
  
  		pktbuf_conf.wqe_skip = OCTTX_PACKET_WQE_SKIP;

[dpdk-stable] patch 'app/testpmd: fix memory leak for TM object' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From ee97d28d8f493007bd555d9056ea1a3ec59ddb94 Mon Sep 17 00:00:00 2001
From: Jasvinder Singh <jasvinder.singh@intel.com>
Date: Tue, 6 Nov 2018 10:23:06 +0000
Subject: [PATCH] app/testpmd: fix memory leak for TM object

[ upstream commit 8bf02b320e27ec27af12d345663f557b04a4c677 ]

Fixes memory leak for shared shaper object of the traffic manager.

Fixes: 5b590fbe09b6 ("app/testpmd: add traffic management forwarding mode")

Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 app/test-pmd/tm.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/test-pmd/tm.c b/app/test-pmd/tm.c
index dd837cb8c..d3ba86505 100644
--- a/app/test-pmd/tm.c
+++ b/app/test-pmd/tm.c
@@ -616,6 +616,7 @@ softport_tm_tc_node_add(portid_t port_id, struct tm_hierarchy *h,
 						error->message,
 						shaper_profile_id);
 
+					free(tnp.shared_shaper_id);
 					return -1;
 				}
 				tnp.shaper_profile_id = shaper_profile_id;
@@ -631,6 +632,7 @@ softport_tm_tc_node_add(portid_t port_id, struct tm_hierarchy *h,
 						error->message,
 						h->tc_node_id[pos][k]);
 
+					free(tnp.shared_shaper_id);
 					return -1;
 				}
 				shaper_profile_id++;
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.704900726 -0800
+++ 0015-app-testpmd-fix-memory-leak-for-TM-object.patch	2019-01-11 02:29:10.797973000 -0800
@@ -1,24 +1,25 @@
-From 8bf02b320e27ec27af12d345663f557b04a4c677 Mon Sep 17 00:00:00 2001
+From ee97d28d8f493007bd555d9056ea1a3ec59ddb94 Mon Sep 17 00:00:00 2001
 From: Jasvinder Singh <jasvinder.singh@intel.com>
 Date: Tue, 6 Nov 2018 10:23:06 +0000
 Subject: [PATCH] app/testpmd: fix memory leak for TM object
 
+[ upstream commit 8bf02b320e27ec27af12d345663f557b04a4c677 ]
+
 Fixes memory leak for shared shaper object of the traffic manager.
 
 Fixes: 5b590fbe09b6 ("app/testpmd: add traffic management forwarding mode")
-Cc: stable@dpdk.org
 
 Signed-off-by: Jasvinder Singh <jasvinder.singh@intel.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
 ---
- app/test-pmd/softnicfwd.c | 2 ++
+ app/test-pmd/tm.c | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/app/test-pmd/softnicfwd.c b/app/test-pmd/softnicfwd.c
-index 7ff622806..94e6669d3 100644
---- a/app/test-pmd/softnicfwd.c
-+++ b/app/test-pmd/softnicfwd.c
-@@ -458,6 +458,7 @@ softport_tm_tc_node_add(portid_t port_id,
+diff --git a/app/test-pmd/tm.c b/app/test-pmd/tm.c
+index dd837cb8c..d3ba86505 100644
+--- a/app/test-pmd/tm.c
++++ b/app/test-pmd/tm.c
+@@ -616,6 +616,7 @@ softport_tm_tc_node_add(portid_t port_id, struct tm_hierarchy *h,
  						error->message,
  						shaper_profile_id);
  
@@ -26,7 +27,7 @@
  					return -1;
  				}
  				tnp.shaper_profile_id = shaper_profile_id;
-@@ -473,6 +474,7 @@ softport_tm_tc_node_add(portid_t port_id,
+@@ -631,6 +632,7 @@ softport_tm_tc_node_add(portid_t port_id, struct tm_hierarchy *h,
  						error->message,
  						h->tc_node_id[pos][k]);
  

[dpdk-stable] patch 'net/octeontx: fix failures when available ports > queues' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 99539d24081a4b7f40c00adcdf1aec320ab0acca Mon Sep 17 00:00:00 2001
From: Anoob Joseph <anoob.joseph@caviumnetworks.com>
Date: Wed, 14 Nov 2018 09:22:03 +0000
Subject: [PATCH] net/octeontx: fix failures when available ports > queues

[ upstream commit 7efd5202f7fecc3f995cbf214cdae834e7a7494f ]

When eth_octeontx is initialized before event_octeontx, eth_octeontx
would initiate setting up of the event device with the max ports and
queues available. If number of ports is more than the number of queues,
some ports would be left unused when the ports and queues are mapped
1:1. But even in that case the ports need to be setup, or otherwise it
would lead to a segmentation fault when event device is started.

Fixes: f7be70e5130e ("net/octeontx: add net device probe and remove")

Signed-off-by: Anoob Joseph <anoob.joseph@caviumnetworks.com>
Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
Acked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
---
 drivers/net/octeontx/octeontx_ethdev.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c
index 830fc8471..049bc32b4 100644
--- a/drivers/net/octeontx/octeontx_ethdev.c
+++ b/drivers/net/octeontx/octeontx_ethdev.c
@@ -1264,15 +1264,8 @@ octeontx_probe(struct rte_vdev_device *dev)
 		res = -EINVAL;
 		goto parse_error;
 	}
-	if (pnum > qnum) {
-		/*
-		 * We don't poll on event ports
-		 * that do not have any queues assigned.
-		 */
-		pnum = qnum;
-		PMD_INIT_LOG(INFO,
-			"reducing number of active event ports to %d", pnum);
-	}
+
+	/* Enable all queues available */
 	for (i = 0; i < qnum; i++) {
 		res = rte_event_queue_setup(evdev, i, NULL);
 		if (res < 0) {
@@ -1282,6 +1275,7 @@ octeontx_probe(struct rte_vdev_device *dev)
 		}
 	}
 
+	/* Enable all ports available */
 	for (i = 0; i < pnum; i++) {
 		res = rte_event_port_setup(evdev, i, NULL);
 		if (res < 0) {
@@ -1290,6 +1284,14 @@ octeontx_probe(struct rte_vdev_device *dev)
 						i, res);
 			goto parse_error;
 		}
+	}
+
+	/*
+	 * Do 1:1 links for ports & queues. All queues would be mapped to
+	 * one port. If there are more ports than queues, then some ports
+	 * won't be linked to any queue.
+	 */
+	for (i = 0; i < qnum; i++) {
 		/* Link one queue to one event port */
 		qlist = i;
 		res = rte_event_port_link(evdev, i, &qlist, NULL, 1);
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.769971873 -0800
+++ 0016-net-octeontx-fix-failures-when-available-ports-queue.patch	2019-01-11 02:29:10.817974000 -0800
@@ -1,8 +1,10 @@
-From 7efd5202f7fecc3f995cbf214cdae834e7a7494f Mon Sep 17 00:00:00 2001
+From 99539d24081a4b7f40c00adcdf1aec320ab0acca Mon Sep 17 00:00:00 2001
 From: Anoob Joseph <anoob.joseph@caviumnetworks.com>
 Date: Wed, 14 Nov 2018 09:22:03 +0000
 Subject: [PATCH] net/octeontx: fix failures when available ports > queues
 
+[ upstream commit 7efd5202f7fecc3f995cbf214cdae834e7a7494f ]
+
 When eth_octeontx is initialized before event_octeontx, eth_octeontx
 would initiate setting up of the event device with the max ports and
 queues available. If number of ports is more than the number of queues,
@@ -11,7 +13,6 @@
 would lead to a segmentation fault when event device is started.
 
 Fixes: f7be70e5130e ("net/octeontx: add net device probe and remove")
-Cc: stable@dpdk.org
 
 Signed-off-by: Anoob Joseph <anoob.joseph@caviumnetworks.com>
 Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
@@ -21,10 +22,10 @@
  1 file changed, 11 insertions(+), 9 deletions(-)
 
 diff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c
-index a3063be42..046e12986 100644
+index 830fc8471..049bc32b4 100644
 --- a/drivers/net/octeontx/octeontx_ethdev.c
 +++ b/drivers/net/octeontx/octeontx_ethdev.c
-@@ -1238,15 +1238,8 @@ octeontx_probe(struct rte_vdev_device *dev)
+@@ -1264,15 +1264,8 @@ octeontx_probe(struct rte_vdev_device *dev)
  		res = -EINVAL;
  		goto parse_error;
  	}
@@ -42,7 +43,7 @@
  	for (i = 0; i < qnum; i++) {
  		res = rte_event_queue_setup(evdev, i, NULL);
  		if (res < 0) {
-@@ -1256,6 +1249,7 @@ octeontx_probe(struct rte_vdev_device *dev)
+@@ -1282,6 +1275,7 @@ octeontx_probe(struct rte_vdev_device *dev)
  		}
  	}
  
@@ -50,7 +51,7 @@
  	for (i = 0; i < pnum; i++) {
  		res = rte_event_port_setup(evdev, i, NULL);
  		if (res < 0) {
-@@ -1264,6 +1258,14 @@ octeontx_probe(struct rte_vdev_device *dev)
+@@ -1290,6 +1284,14 @@ octeontx_probe(struct rte_vdev_device *dev)
  						i, res);
  			goto parse_error;
  		}

[dpdk-stable] patch 'app/pdump: fix port id storage size' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From bd65361a65a27534bfe4e6a31ed39f156e4a35f7 Mon Sep 17 00:00:00 2001
From: Marko Kovacevic <marko.kovacevic@intel.com>
Date: Wed, 14 Nov 2018 08:56:45 +0000
Subject: [PATCH] app/pdump: fix port id storage size

[ upstream commit e772cf1bd0c10c13375d7de9acff842b76cb8f35 ]

port_id size should be uint16_t,
fix where it is defined as uint8_t

Fixes: f8244c6399d9 ("ethdev: increase port id range")

Signed-off-by: Marko Kovacevic <marko.kovacevic@intel.com>
Acked-by: Reshma Pattan <reshma.pattan@intel.com>
---
 app/pdump/main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/pdump/main.c b/app/pdump/main.c
index 66272f59a..8e42b3647 100644
--- a/app/pdump/main.c
+++ b/app/pdump/main.c
@@ -148,8 +148,8 @@ struct pdump_tuples {
 
 	/* params for packet dumping */
 	enum pdump_by dump_by_type;
-	int rx_vdev_id;
-	int tx_vdev_id;
+	uint16_t rx_vdev_id;
+	uint16_t tx_vdev_id;
 	enum pcap_stream rx_vdev_stream_type;
 	enum pcap_stream tx_vdev_stream_type;
 	bool single_pdump_dev;
@@ -301,7 +301,7 @@ parse_pdump(const char *optarg)
 				&parse_uint_value, &v);
 		if (ret < 0)
 			goto free_kvlist;
-		pt->port = (uint8_t) v.val;
+		pt->port = (uint16_t) v.val;
 		pt->dump_by_type = PORT_ID;
 	} else if (cnt2 == 1) {
 		ret = rte_kvargs_process(kvlist, PDUMP_PCI_ARG,
@@ -489,7 +489,7 @@ disable_pdump(struct pdump_tuples *pt)
 }
 
 static inline void
-pdump_rxtx(struct rte_ring *ring, uint8_t vdev_id, struct pdump_stats *stats)
+pdump_rxtx(struct rte_ring *ring, uint16_t vdev_id, struct pdump_stats *stats)
 {
 	/* write input packets of port to vdev for pdump */
 	struct rte_mbuf *rxtx_bufs[BURST_SIZE];
@@ -516,7 +516,7 @@ pdump_rxtx(struct rte_ring *ring, uint8_t vdev_id, struct pdump_stats *stats)
 }
 
 static void
-free_ring_data(struct rte_ring *ring, uint8_t vdev_id,
+free_ring_data(struct rte_ring *ring, uint16_t vdev_id,
 		struct pdump_stats *stats)
 {
 	while (rte_ring_count(ring))
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.822341303 -0800
+++ 0017-app-pdump-fix-port-id-storage-size.patch	2019-01-11 02:29:10.824973000 -0800
@@ -1,13 +1,14 @@
-From e772cf1bd0c10c13375d7de9acff842b76cb8f35 Mon Sep 17 00:00:00 2001
+From bd65361a65a27534bfe4e6a31ed39f156e4a35f7 Mon Sep 17 00:00:00 2001
 From: Marko Kovacevic <marko.kovacevic@intel.com>
 Date: Wed, 14 Nov 2018 08:56:45 +0000
 Subject: [PATCH] app/pdump: fix port id storage size
 
+[ upstream commit e772cf1bd0c10c13375d7de9acff842b76cb8f35 ]
+
 port_id size should be uint16_t,
 fix where it is defined as uint8_t
 
 Fixes: f8244c6399d9 ("ethdev: increase port id range")
-Cc: stable@dpdk.org
 
 Signed-off-by: Marko Kovacevic <marko.kovacevic@intel.com>
 Acked-by: Reshma Pattan <reshma.pattan@intel.com>
@@ -16,10 +17,10 @@
  1 file changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/app/pdump/main.c b/app/pdump/main.c
-index d96556ecf..9e86bf623 100644
+index 66272f59a..8e42b3647 100644
 --- a/app/pdump/main.c
 +++ b/app/pdump/main.c
-@@ -119,8 +119,8 @@ struct pdump_tuples {
+@@ -148,8 +148,8 @@ struct pdump_tuples {
  
  	/* params for packet dumping */
  	enum pdump_by dump_by_type;
@@ -30,7 +31,7 @@
  	enum pcap_stream rx_vdev_stream_type;
  	enum pcap_stream tx_vdev_stream_type;
  	bool single_pdump_dev;
-@@ -266,7 +266,7 @@ parse_pdump(const char *optarg)
+@@ -301,7 +301,7 @@ parse_pdump(const char *optarg)
  				&parse_uint_value, &v);
  		if (ret < 0)
  			goto free_kvlist;
@@ -39,7 +40,7 @@
  		pt->dump_by_type = PORT_ID;
  	} else if (cnt2 == 1) {
  		ret = rte_kvargs_process(kvlist, PDUMP_PCI_ARG,
-@@ -435,7 +435,7 @@ disable_pdump(struct pdump_tuples *pt)
+@@ -489,7 +489,7 @@ disable_pdump(struct pdump_tuples *pt)
  }
  
  static inline void
@@ -48,7 +49,7 @@
  {
  	/* write input packets of port to vdev for pdump */
  	struct rte_mbuf *rxtx_bufs[BURST_SIZE];
-@@ -462,7 +462,7 @@ pdump_rxtx(struct rte_ring *ring, uint8_t vdev_id, struct pdump_stats *stats)
+@@ -516,7 +516,7 @@ pdump_rxtx(struct rte_ring *ring, uint8_t vdev_id, struct pdump_stats *stats)
  }
  
  static void

[dpdk-stable] patch 'doc: add cross-compilation in sample apps guide' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From c151db4aa0099e15440e8a1d687b46a2f8574161 Mon Sep 17 00:00:00 2001
From: Gavin Hu <gavin.hu@arm.com>
Date: Mon, 17 Sep 2018 10:13:23 +0800
Subject: [PATCH] doc: add cross-compilation in sample apps guide

[ upstream commit f00d0d5fb652504ad6af2ab1a8b146b1cb86fe38 ]

Fixes: 7cacb05655 ("doc: add generic build instructions for sample apps")

Signed-off-by: Gavin Hu <gavin.hu@arm.com>
Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
---
 doc/guides/sample_app_ug/compiling.rst | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/doc/guides/sample_app_ug/compiling.rst b/doc/guides/sample_app_ug/compiling.rst
index 8bedaa79b..3fe713114 100644
--- a/doc/guides/sample_app_ug/compiling.rst
+++ b/doc/guides/sample_app_ug/compiling.rst
@@ -36,7 +36,6 @@ This section explains how to compile the DPDK sample applications.
 To compile all the sample applications
 --------------------------------------
 
-
 Set the path to DPDK source code if its not set:
 
     .. code-block:: console
@@ -120,3 +119,17 @@ Build the application:
 
         export RTE_TARGET=build
         make
+
+To cross compile the sample application(s)
+------------------------------------------
+
+For cross compiling the sample application(s), please append 'CROSS=$(CROSS_COMPILER_PREFIX)' to the 'make' command.
+In example of AARCH64 cross compiling:
+
+    .. code-block:: console
+
+        export RTE_TARGET=build
+        export RTE_SDK=/path/to/rte_sdk
+        make -C examples CROSS=aarch64-linux-gnu-
+               or
+        make CROSS=aarch64-linux-gnu-
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.877166340 -0800
+++ 0018-doc-add-cross-compilation-in-sample-apps-guide.patch	2019-01-11 02:29:10.831972000 -0800
@@ -1,10 +1,11 @@
-From f00d0d5fb652504ad6af2ab1a8b146b1cb86fe38 Mon Sep 17 00:00:00 2001
+From c151db4aa0099e15440e8a1d687b46a2f8574161 Mon Sep 17 00:00:00 2001
 From: Gavin Hu <gavin.hu@arm.com>
 Date: Mon, 17 Sep 2018 10:13:23 +0800
 Subject: [PATCH] doc: add cross-compilation in sample apps guide
 
+[ upstream commit f00d0d5fb652504ad6af2ab1a8b146b1cb86fe38 ]
+
 Fixes: 7cacb05655 ("doc: add generic build instructions for sample apps")
-Cc: stable@dpdk.org
 
 Signed-off-by: Gavin Hu <gavin.hu@arm.com>
 Reviewed-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
@@ -13,10 +14,10 @@
  1 file changed, 14 insertions(+), 1 deletion(-)
 
 diff --git a/doc/guides/sample_app_ug/compiling.rst b/doc/guides/sample_app_ug/compiling.rst
-index a2d75ed22..6f04743c8 100644
+index 8bedaa79b..3fe713114 100644
 --- a/doc/guides/sample_app_ug/compiling.rst
 +++ b/doc/guides/sample_app_ug/compiling.rst
-@@ -9,7 +9,6 @@ This section explains how to compile the DPDK sample applications.
+@@ -36,7 +36,6 @@ This section explains how to compile the DPDK sample applications.
  To compile all the sample applications
  --------------------------------------
  
@@ -24,7 +25,7 @@
  Set the path to DPDK source code if its not set:
  
      .. code-block:: console
-@@ -93,3 +92,17 @@ Build the application:
+@@ -120,3 +119,17 @@ Build the application:
  
          export RTE_TARGET=build
          make

[dpdk-stable] patch 'net/mlx4: fix possible uninitialized variable' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 01/13/19. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From 2798999e0889d6762b4d79450028a6369ce52f22 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas@monjalon.net>
Date: Fri, 16 Nov 2018 17:58:52 +0100
Subject: [PATCH] net/mlx4: fix possible uninitialized variable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 554f06d10b1c646f20d7011a30b26fb43507d596 ]

When compiling with gcc -O1, this error appears:
	drivers/net/mlx4/mlx4_ethdev.c: In function ‘mlx4_rxmode_toggle’:
	rte_log.h:321:3: error:
	‘mode’ may be used uninitialized in this function

The function mlx4_rxmode_toggle is never called with a value which
is not in the switch block, but GCC complains about it with -O1.
So the default case is "fixed" by setting string "undefined".

Fixes: eacaac7bae36 ("net/mlx4: restore promisc and allmulti support")

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 drivers/net/mlx4/mlx4_ethdev.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/mlx4/mlx4_ethdev.c b/drivers/net/mlx4/mlx4_ethdev.c
index 89f552c87..170e2cb1b 100644
--- a/drivers/net/mlx4/mlx4_ethdev.c
+++ b/drivers/net/mlx4/mlx4_ethdev.c
@@ -386,6 +386,8 @@ mlx4_rxmode_toggle(struct rte_eth_dev *dev, enum rxmode_toggle toggle)
 		mode = "all multicast";
 		dev->data->all_multicast = toggle & 1;
 		break;
+	default:
+		mode = "undefined";
 	}
 	if (!mlx4_flow_sync(priv, &error))
 		return;
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-11 02:29:11.933698072 -0800
+++ 0019-net-mlx4-fix-possible-uninitialized-variable.patch	2019-01-11 02:29:10.839972000 -0800
@@ -1,4 +1,4 @@
-From 554f06d10b1c646f20d7011a30b26fb43507d596 Mon Sep 17 00:00:00 2001
+From 2798999e0889d6762b4d79450028a6369ce52f22 Mon Sep 17 00:00:00 2001
 From: Thomas Monjalon <thomas@monjalon.net>
 Date: Fri, 16 Nov 2018 17:58:52 +0100
 Subject: [PATCH] net/mlx4: fix possible uninitialized variable
@@ -6,6 +6,8 @@
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+[ upstream commit 554f06d10b1c646f20d7011a30b26fb43507d596 ]
+
 When compiling with gcc -O1, this error appears:
 	drivers/net/mlx4/mlx4_ethdev.c: In function ‘mlx4_rxmode_toggle’:
 	rte_log.h:321:3: error:
@@ -16,7 +18,6 @@
 So the default case is "fixed" by setting string "undefined".
 
 Fixes: eacaac7bae36 ("net/mlx4: restore promisc and allmulti support")
-Cc: stable@dpdk.org
 
 Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
 ---
@@ -24,10 +25,10 @@
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/net/mlx4/mlx4_ethdev.c b/drivers/net/mlx4/mlx4_ethdev.c
-index 30deb3ef0..195a1b6df 100644
+index 89f552c87..170e2cb1b 100644
 --- a/drivers/net/mlx4/mlx4_ethdev.c
 +++ b/drivers/net/mlx4/mlx4_ethdev.c
-@@ -360,6 +360,8 @@ mlx4_rxmode_toggle(struct rte_eth_dev *dev, enum rxmode_toggle toggle)
+@@ -386,6 +386,8 @@ mlx4_rxmode_toggle(struct rte_eth_dev *dev, enum rxmode_toggle toggle)
  		mode = "all multicast";
  		dev->data->all_multicast = toggle & 1;
  		break;