[dpdk-stable] patch 'net/mlx5: fix memory event on secondary process' has been queued to LTS release 18.11.2

[dpdk-stable] patch 'net/mlx5: fix memory event on secondary process' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 2cca8e4a1d44e055853562b04d34f45efac7038a Mon Sep 17 00:00:00 2001
From: Yongseok Koh <yskoh@mellanox.com>
Date: Mon, 1 Apr 2019 14:12:53 -0700
Subject: [PATCH] net/mlx5: fix memory event on secondary process

[ upstream commit 3ebe65805992aff61f87a9808c4a56053e9f0351 ]

As the memory event is propagated to secondary processes, the event is
processed redundantly. This should be processed once because the data
structure used for MR and the event is global across the processes.

Fixes: 974f1e7ef146 ("net/mlx5: add new memory region support")

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>
---
 drivers/net/mlx5/mlx5.c    | 5 +++--
 drivers/net/mlx5/mlx5_mr.c | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 80a27da89..d91d55b56 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -158,7 +158,8 @@ mlx5_prepare_shared_data(void)
 			LIST_INIT(&mlx5_shared_data->mem_event_cb_list);
 			rte_rwlock_init(&mlx5_shared_data->mem_event_rwlock);
+			rte_mem_event_callback_register("MLX5_MEM_EVENT_CB",
+							mlx5_mr_mem_event_cb,
+							NULL);
 		}
-		rte_mem_event_callback_register("MLX5_MEM_EVENT_CB",
-						mlx5_mr_mem_event_cb, NULL);
 	}
 	rte_spinlock_unlock(&mlx5_shared_data_lock);
diff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c
index 700d83d1b..d336a77e4 100644
--- a/drivers/net/mlx5/mlx5_mr.c
+++ b/drivers/net/mlx5/mlx5_mr.c
@@ -892,4 +892,6 @@ mlx5_mr_mem_event_cb(enum rte_mem_event event_type, const void *addr,
 	struct mlx5_dev_list *dev_list = &mlx5_shared_data->mem_event_cb_list;
 
+	/* Must be called from the primary process. */
+	assert(rte_eal_process_type() == RTE_PROC_PRIMARY);
 	switch (event_type) {
 	case RTE_MEM_EVENT_FREE:
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:13.870612931 +0100
+++ 0001-net-mlx5-fix-memory-event-on-secondary-process.patch	2019-04-30 17:58:13.740141151 +0100
@@ -1 +1 @@
-From 3ebe65805992aff61f87a9808c4a56053e9f0351 Mon Sep 17 00:00:00 2001
+From 2cca8e4a1d44e055853562b04d34f45efac7038a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3ebe65805992aff61f87a9808c4a56053e9f0351 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 1d7ca615b..2208cc922 100644
+index 80a27da89..d91d55b56 100644
@@ -24 +25 @@
-@@ -323,7 +323,8 @@ mlx5_prepare_shared_data(void)
+@@ -158,7 +158,8 @@ mlx5_prepare_shared_data(void)
@@ -36 +37 @@
-index 0f0a64f0a..88484dd50 100644
+index 700d83d1b..d336a77e4 100644
@@ -39 +40 @@
-@@ -893,4 +893,6 @@ mlx5_mr_mem_event_cb(enum rte_mem_event event_type, const void *addr,
+@@ -892,4 +892,6 @@ mlx5_mr_mem_event_cb(enum rte_mem_event event_type, const void *addr,

[dpdk-stable] patch 'net/mlx4: change device reference for secondary process' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From fbc7be121f71629834a60f50d4419932740bddd1 Mon Sep 17 00:00:00 2001
From: Yongseok Koh <yskoh@mellanox.com>
Date: Mon, 1 Apr 2019 14:15:51 -0700
Subject: [PATCH] net/mlx4: change device reference for secondary process

[ upstream commit 099c2c5376131b3d352d70f8904e586c0e84651e ]

rte_eth_devices[] is not shared between primary and secondary process,
but a static array to each process. The reverse pointer of device
(priv->dev) becomes invalid if mlx4 supports secondary process.
Instead, priv has the pointer to shared data of the device,
  struct rte_eth_dev_data *dev_data;

Two macros are added,
  #define PORT_ID(priv) ((priv)->dev_data->port_id)
  #define ETH_DEV(priv) (&rte_eth_devices[PORT_ID(priv)])

Suggested-by: Raslan Darawsheh <rasland@mellanox.com>
Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>
---
 drivers/net/mlx4/mlx4.c      |  4 ++--
 drivers/net/mlx4/mlx4.h      |  5 ++++-
 drivers/net/mlx4/mlx4_flow.c | 39 +++++++++++++++++++-----------------
 drivers/net/mlx4/mlx4_intr.c | 20 +++++++++---------
 drivers/net/mlx4/mlx4_mr.c   |  8 ++++----
 drivers/net/mlx4/mlx4_rxq.c  | 36 +++++++++++++++++----------------
 drivers/net/mlx4/mlx4_txq.c  |  8 ++++----
 7 files changed, 64 insertions(+), 56 deletions(-)

diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index 8aa116cb7..4bc966d5f 100644
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -753,9 +753,9 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
 		 */
 		eth_dev->intr_handle = &priv->intr_handle;
-		priv->dev = eth_dev;
+		priv->dev_data = eth_dev->data;
 		eth_dev->dev_ops = &mlx4_dev_ops;
 		/* Bring Ethernet device up. */
 		DEBUG("forcing Ethernet interface up");
-		mlx4_dev_set_link_up(priv->dev);
+		mlx4_dev_set_link_up(eth_dev);
 		/* Update link status once if waiting for LSC. */
 		if (eth_dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC)
diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h
index 180e5186c..fc568eb3e 100644
--- a/drivers/net/mlx4/mlx4.h
+++ b/drivers/net/mlx4/mlx4.h
@@ -80,5 +80,5 @@ struct mlx4_priv {
 	LIST_ENTRY(mlx4_priv) mem_event_cb;
 	/**< Called by memory event callback. */
-	struct rte_eth_dev *dev; /**< Ethernet device. */
+	struct rte_eth_dev_data *dev_data;  /* Pointer to device data. */
 	struct ibv_context *ctx; /**< Verbs context. */
 	struct ibv_device_attr device_attr; /**< Device properties. */
@@ -114,4 +114,7 @@ struct mlx4_priv {
 };
 
+#define PORT_ID(priv) ((priv)->dev_data->port_id)
+#define ETH_DEV(priv) (&rte_eth_devices[PORT_ID(priv)])
+
 /* mlx4_ethdev.c */
 
diff --git a/drivers/net/mlx4/mlx4_flow.c b/drivers/net/mlx4/mlx4_flow.c
index f16037d1d..5136d136f 100644
--- a/drivers/net/mlx4/mlx4_flow.c
+++ b/drivers/net/mlx4/mlx4_flow.c
@@ -768,5 +768,5 @@ fill:
 				break;
 			queue = action->conf;
-			if (queue->index >= priv->dev->data->nb_rx_queues) {
+			if (queue->index >= ETH_DEV(priv)->data->nb_rx_queues) {
 				msg = "queue target index beyond number of"
 					" configured Rx queues";
@@ -797,5 +797,5 @@ fill:
 			for (i = 0; i < rss->queue_num; ++i)
 				if (rss->queue[i] >=
-				    priv->dev->data->nb_rx_queues)
+				    ETH_DEV(priv)->data->nb_rx_queues)
 					break;
 			if (i != rss->queue_num) {
@@ -1067,6 +1067,6 @@ mlx4_flow_toggle(struct mlx4_priv *priv,
 		for (i = 0; i != rss->queues; ++i)
 			if (rss->queue_id[i] >=
-			    priv->dev->data->nb_rx_queues ||
-			    !priv->dev->data->rx_queues[rss->queue_id[i]]) {
+			    ETH_DEV(priv)->data->nb_rx_queues ||
+			    !ETH_DEV(priv)->data->rx_queues[rss->queue_id[i]]) {
 				missing = 1;
 				break;
@@ -1253,5 +1253,5 @@ mlx4_flow_internal_next_vlan(struct mlx4_priv *priv, uint16_t vlan)
 {
 	while (vlan < 4096) {
-		if (priv->dev->data->vlan_filter_conf.ids[vlan / 64] &
+		if (ETH_DEV(priv)->data->vlan_filter_conf.ids[vlan / 64] &
 		    (UINT64_C(1) << (vlan % 64)))
 			return vlan;
@@ -1330,5 +1330,5 @@ mlx4_flow_internal(struct mlx4_priv *priv, struct rte_flow_error *error)
 	 */
 	uint32_t queues =
-		rte_align32pow2(priv->dev->data->nb_rx_queues + 1) >> 1;
+		rte_align32pow2(ETH_DEV(priv)->data->nb_rx_queues + 1) >> 1;
 	uint16_t queue[queues];
 	struct rte_flow_action_rss action_rss = {
@@ -1352,7 +1352,7 @@ mlx4_flow_internal(struct mlx4_priv *priv, struct rte_flow_error *error)
 	struct ether_addr *rule_mac = &eth_spec.dst;
 	rte_be16_t *rule_vlan =
-		(priv->dev->data->dev_conf.rxmode.offloads &
+		(ETH_DEV(priv)->data->dev_conf.rxmode.offloads &
 		 DEV_RX_OFFLOAD_VLAN_FILTER) &&
-		!priv->dev->data->promiscuous ?
+		!ETH_DEV(priv)->data->promiscuous ?
 		&vlan_spec.tci :
 		NULL;
@@ -1434,5 +1434,5 @@ next_vlan:
 			/* Not found, create a new flow rule. */
 			memcpy(rule_mac, mac, sizeof(*mac));
-			flow = mlx4_flow_create(priv->dev, &attr, pattern,
+			flow = mlx4_flow_create(ETH_DEV(priv), &attr, pattern,
 						actions, error);
 			if (!flow) {
@@ -1450,13 +1450,14 @@ next_vlan:
 	}
 	/* Take care of promiscuous and all multicast flow rules. */
-	if (priv->dev->data->promiscuous || priv->dev->data->all_multicast) {
+	if (ETH_DEV(priv)->data->promiscuous ||
+	    ETH_DEV(priv)->data->all_multicast) {
 		for (flow = LIST_FIRST(&priv->flows);
 		     flow && flow->internal;
 		     flow = LIST_NEXT(flow, next)) {
-			if (priv->dev->data->promiscuous) {
+			if (ETH_DEV(priv)->data->promiscuous) {
 				if (flow->promisc)
 					break;
 			} else {
-				assert(priv->dev->data->all_multicast);
+				assert(ETH_DEV(priv)->data->all_multicast);
 				if (flow->allmulti)
 					break;
@@ -1472,14 +1473,14 @@ next_vlan:
 		if (!flow || !flow->internal) {
 			/* Not found, create a new flow rule. */
-			if (priv->dev->data->promiscuous) {
+			if (ETH_DEV(priv)->data->promiscuous) {
 				pattern[1].spec = NULL;
 				pattern[1].mask = NULL;
 			} else {
-				assert(priv->dev->data->all_multicast);
+				assert(ETH_DEV(priv)->data->all_multicast);
 				pattern[1].spec = &eth_allmulti;
 				pattern[1].mask = &eth_allmulti;
 			}
 			pattern[2] = pattern[3];
-			flow = mlx4_flow_create(priv->dev, &attr, pattern,
+			flow = mlx4_flow_create(ETH_DEV(priv), &attr, pattern,
 						actions, error);
 			if (!flow) {
@@ -1498,5 +1499,6 @@ error:
 
 		if (!flow->select)
-			claim_zero(mlx4_flow_destroy(priv->dev, flow, error));
+			claim_zero(mlx4_flow_destroy(ETH_DEV(priv), flow,
+						     error));
 		else
 			flow->select = 0;
@@ -1536,5 +1538,6 @@ mlx4_flow_sync(struct mlx4_priv *priv, struct rte_flow_error *error)
 		     flow && flow->internal;
 		     flow = LIST_FIRST(&priv->flows))
-			claim_zero(mlx4_flow_destroy(priv->dev, flow, error));
+			claim_zero(mlx4_flow_destroy(ETH_DEV(priv), flow,
+						     error));
 	} else {
 		/* Refresh internal rules. */
@@ -1569,5 +1572,5 @@ mlx4_flow_clean(struct mlx4_priv *priv)
 
 	while ((flow = LIST_FIRST(&priv->flows)))
-		mlx4_flow_destroy(priv->dev, flow, NULL);
+		mlx4_flow_destroy(ETH_DEV(priv), flow, NULL);
 	assert(LIST_EMPTY(&priv->rss));
 }
diff --git a/drivers/net/mlx4/mlx4_intr.c b/drivers/net/mlx4/mlx4_intr.c
index ec9124219..4f3352675 100644
--- a/drivers/net/mlx4/mlx4_intr.c
+++ b/drivers/net/mlx4/mlx4_intr.c
@@ -66,5 +66,5 @@ mlx4_rx_intr_vec_enable(struct mlx4_priv *priv)
 {
 	unsigned int i;
-	unsigned int rxqs_n = priv->dev->data->nb_rx_queues;
+	unsigned int rxqs_n = ETH_DEV(priv)->data->nb_rx_queues;
 	unsigned int n = RTE_MIN(rxqs_n, (uint32_t)RTE_MAX_RXTX_INTR_VEC_ID);
 	unsigned int count = 0;
@@ -80,5 +80,5 @@ mlx4_rx_intr_vec_enable(struct mlx4_priv *priv)
 	}
 	for (i = 0; i != n; ++i) {
-		struct rxq *rxq = priv->dev->data->rx_queues[i];
+		struct rxq *rxq = ETH_DEV(priv)->data->rx_queues[i];
 
 		/* Skip queues that cannot request interrupts. */
@@ -121,10 +121,10 @@ mlx4_link_status_alarm(struct mlx4_priv *priv)
 {
 	const struct rte_intr_conf *const intr_conf =
-		&priv->dev->data->dev_conf.intr_conf;
+		&ETH_DEV(priv)->data->dev_conf.intr_conf;
 
 	assert(priv->intr_alarm == 1);
 	priv->intr_alarm = 0;
 	if (intr_conf->lsc && !mlx4_link_status_check(priv))
-		_rte_eth_dev_callback_process(priv->dev,
+		_rte_eth_dev_callback_process(ETH_DEV(priv),
 					      RTE_ETH_EVENT_INTR_LSC,
 					      NULL);
@@ -146,6 +146,6 @@ static int
 mlx4_link_status_check(struct mlx4_priv *priv)
 {
-	struct rte_eth_link *link = &priv->dev->data->dev_link;
-	int ret = mlx4_link_update(priv->dev, 0);
+	struct rte_eth_link *link = &ETH_DEV(priv)->data->dev_link;
+	int ret = mlx4_link_update(ETH_DEV(priv), 0);
 
 	if (ret)
@@ -186,5 +186,5 @@ mlx4_interrupt_handler(struct mlx4_priv *priv)
 	struct ibv_async_event event;
 	const struct rte_intr_conf *const intr_conf =
-		&priv->dev->data->dev_conf.intr_conf;
+		&ETH_DEV(priv)->data->dev_conf.intr_conf;
 	unsigned int i;
 
@@ -209,5 +209,5 @@ mlx4_interrupt_handler(struct mlx4_priv *priv)
 	for (i = 0; i != RTE_DIM(caught); ++i)
 		if (caught[i])
-			_rte_eth_dev_callback_process(priv->dev, type[i],
+			_rte_eth_dev_callback_process(ETH_DEV(priv), type[i],
 						      NULL);
 }
@@ -283,5 +283,5 @@ mlx4_intr_install(struct mlx4_priv *priv)
 {
 	const struct rte_intr_conf *const intr_conf =
-		&priv->dev->data->dev_conf.intr_conf;
+		&ETH_DEV(priv)->data->dev_conf.intr_conf;
 	int rc;
 
@@ -382,5 +382,5 @@ mlx4_rxq_intr_enable(struct mlx4_priv *priv)
 {
 	const struct rte_intr_conf *const intr_conf =
-		&priv->dev->data->dev_conf.intr_conf;
+		&ETH_DEV(priv)->data->dev_conf.intr_conf;
 
 	if (intr_conf->rxq && mlx4_rx_intr_vec_enable(priv) < 0)
diff --git a/drivers/net/mlx4/mlx4_mr.c b/drivers/net/mlx4/mlx4_mr.c
index 4376ad0b6..e4be46ab2 100644
--- a/drivers/net/mlx4/mlx4_mr.c
+++ b/drivers/net/mlx4/mlx4_mr.c
@@ -897,5 +897,5 @@ mlx4_mr_mem_event_cb(enum rte_mem_event event_type, const void *addr,
 		/* Iterate all the existing mlx4 devices. */
 		LIST_FOREACH(priv, &mlx4_mem_event_cb_list, mem_event_cb)
-			mlx4_mr_mem_event_free_cb(priv->dev, addr, len);
+			mlx4_mr_mem_event_free_cb(ETH_DEV(priv), addr, len);
 		rte_rwlock_read_unlock(&mlx4_mem_event_rwlock);
 		break;
@@ -1029,5 +1029,5 @@ mlx4_rx_addr2mr_bh(struct rxq *rxq, uintptr_t addr)
 	DEBUG("Rx queue %u: miss on top-half, mru=%u, head=%u, addr=%p",
 	      rxq->stats.idx, mr_ctrl->mru, mr_ctrl->head, (void *)addr);
-	return mlx4_mr_addr2mr_bh(priv->dev, mr_ctrl, addr);
+	return mlx4_mr_addr2mr_bh(ETH_DEV(priv), mr_ctrl, addr);
 }
 
@@ -1051,5 +1051,5 @@ mlx4_tx_addr2mr_bh(struct txq *txq, uintptr_t addr)
 	DEBUG("Tx queue %u: miss on top-half, mru=%u, head=%u, addr=%p",
 	      txq->stats.idx, mr_ctrl->mru, mr_ctrl->head, (void *)addr);
-	return mlx4_mr_addr2mr_bh(priv->dev, mr_ctrl, addr);
+	return mlx4_mr_addr2mr_bh(ETH_DEV(priv), mr_ctrl, addr);
 }
 
@@ -1226,5 +1226,5 @@ mlx4_tx_update_ext_mp(struct txq *txq, uintptr_t addr, struct rte_mempool *mp)
 	struct mlx4_priv *priv = txq->priv;
 
-	mlx4_mr_update_ext_mp(priv->dev, mr_ctrl, mp);
+	mlx4_mr_update_ext_mp(ETH_DEV(priv), mr_ctrl, mp);
 	return mlx4_tx_addr2mr_bh(txq, addr);
 }
diff --git a/drivers/net/mlx4/mlx4_rxq.c b/drivers/net/mlx4/mlx4_rxq.c
index 3782c6baa..50f33eb0c 100644
--- a/drivers/net/mlx4/mlx4_rxq.c
+++ b/drivers/net/mlx4/mlx4_rxq.c
@@ -177,4 +177,5 @@ mlx4_rss_attach(struct mlx4_rss *rss)
 	struct ibv_wq *ind_tbl[rss->queues];
 	struct mlx4_priv *priv = rss->priv;
+	struct rte_eth_dev *dev = ETH_DEV(priv);
 	const char *msg;
 	unsigned int i = 0;
@@ -190,6 +191,6 @@ mlx4_rss_attach(struct mlx4_rss *rss)
 		struct rxq *rxq = NULL;
 
-		if (id < priv->dev->data->nb_rx_queues)
-			rxq = priv->dev->data->rx_queues[id];
+		if (id < dev->data->nb_rx_queues)
+			rxq = dev->data->rx_queues[id];
 		if (!rxq) {
 			ret = EINVAL;
@@ -270,5 +271,5 @@ error:
 	}
 	while (i--)
-		mlx4_rxq_detach(priv->dev->data->rx_queues[rss->queue_id[i]]);
+		mlx4_rxq_detach(dev->data->rx_queues[rss->queue_id[i]]);
 	ERROR("mlx4: %s", msg);
 	--rss->usecnt;
@@ -292,4 +293,5 @@ mlx4_rss_detach(struct mlx4_rss *rss)
 {
 	struct mlx4_priv *priv = rss->priv;
+	struct rte_eth_dev *dev = ETH_DEV(priv);
 	unsigned int i;
 
@@ -304,5 +306,5 @@ mlx4_rss_detach(struct mlx4_rss *rss)
 	rss->ind = NULL;
 	for (i = 0; i != rss->queues; ++i)
-		mlx4_rxq_detach(priv->dev->data->rx_queues[rss->queue_id[i]]);
+		mlx4_rxq_detach(dev->data->rx_queues[rss->queue_id[i]]);
 }
 
@@ -330,5 +332,5 @@ int
 mlx4_rss_init(struct mlx4_priv *priv)
 {
-	struct rte_eth_dev *dev = priv->dev;
+	struct rte_eth_dev *dev = ETH_DEV(priv);
 	uint8_t log2_range = rte_log2_u32(dev->data->nb_rx_queues);
 	uint32_t wq_num_prev = 0;
@@ -339,5 +341,5 @@ mlx4_rss_init(struct mlx4_priv *priv)
 	if (priv->rss_init)
 		return 0;
-	if (priv->dev->data->nb_rx_queues > priv->hw_rss_max_qps) {
+	if (ETH_DEV(priv)->data->nb_rx_queues > priv->hw_rss_max_qps) {
 		ERROR("RSS does not support more than %d queues",
 		      priv->hw_rss_max_qps);
@@ -357,6 +359,6 @@ mlx4_rss_init(struct mlx4_priv *priv)
 		return -ret;
 	}
-	for (i = 0; i != priv->dev->data->nb_rx_queues; ++i) {
-		struct rxq *rxq = priv->dev->data->rx_queues[i];
+	for (i = 0; i != ETH_DEV(priv)->data->nb_rx_queues; ++i) {
+		struct rxq *rxq = ETH_DEV(priv)->data->rx_queues[i];
 		struct ibv_cq *cq;
 		struct ibv_wq *wq;
@@ -433,5 +435,5 @@ error:
 	      i, msg, strerror(ret));
 	while (i--) {
-		struct rxq *rxq = priv->dev->data->rx_queues[i];
+		struct rxq *rxq = ETH_DEV(priv)->data->rx_queues[i];
 
 		if (rxq)
@@ -458,6 +460,6 @@ mlx4_rss_deinit(struct mlx4_priv *priv)
 	if (!priv->rss_init)
 		return;
-	for (i = 0; i != priv->dev->data->nb_rx_queues; ++i) {
-		struct rxq *rxq = priv->dev->data->rx_queues[i];
+	for (i = 0; i != ETH_DEV(priv)->data->nb_rx_queues; ++i) {
+		struct rxq *rxq = ETH_DEV(priv)->data->rx_queues[i];
 
 		if (rxq) {
@@ -495,5 +497,5 @@ mlx4_rxq_attach(struct rxq *rxq)
 
 	struct mlx4_priv *priv = rxq->priv;
-	struct rte_eth_dev *dev = priv->dev;
+	struct rte_eth_dev *dev = ETH_DEV(priv);
 	const uint32_t elts_n = 1 << rxq->elts_n;
 	const uint32_t sges_n = 1 << rxq->sges_n;
@@ -562,5 +564,5 @@ mlx4_rxq_attach(struct rxq *rxq)
 	/* Pre-register Rx mempool. */
 	DEBUG("port %u Rx queue %u registering mp %s having %u chunks",
-	      priv->dev->data->port_id, rxq->stats.idx,
+	      ETH_DEV(priv)->data->port_id, rxq->stats.idx,
 	      rxq->mp->name, rxq->mp->nb_mem_chunks);
 	mlx4_mr_update_mp(dev, &rxq->mr_ctrl, rxq->mp);
@@ -918,9 +920,9 @@ mlx4_rx_queue_release(void *dpdk_rxq)
 		return;
 	priv = rxq->priv;
-	for (i = 0; i != priv->dev->data->nb_rx_queues; ++i)
-		if (priv->dev->data->rx_queues[i] == rxq) {
+	for (i = 0; i != ETH_DEV(priv)->data->nb_rx_queues; ++i)
+		if (ETH_DEV(priv)->data->rx_queues[i] == rxq) {
 			DEBUG("%p: removing Rx queue %p from list",
-			      (void *)priv->dev, (void *)rxq);
-			priv->dev->data->rx_queues[i] = NULL;
+			      (void *)ETH_DEV(priv), (void *)rxq);
+			ETH_DEV(priv)->data->rx_queues[i] = NULL;
 			break;
 		}
diff --git a/drivers/net/mlx4/mlx4_txq.c b/drivers/net/mlx4/mlx4_txq.c
index 8142775fc..352700820 100644
--- a/drivers/net/mlx4/mlx4_txq.c
+++ b/drivers/net/mlx4/mlx4_txq.c
@@ -358,9 +358,9 @@ mlx4_tx_queue_release(void *dpdk_txq)
 		return;
 	priv = txq->priv;
-	for (i = 0; i != priv->dev->data->nb_tx_queues; ++i)
-		if (priv->dev->data->tx_queues[i] == txq) {
+	for (i = 0; i != ETH_DEV(priv)->data->nb_tx_queues; ++i)
+		if (ETH_DEV(priv)->data->tx_queues[i] == txq) {
 			DEBUG("%p: removing Tx queue %p from list",
-			      (void *)priv->dev, (void *)txq);
-			priv->dev->data->tx_queues[i] = NULL;
+			      (void *)ETH_DEV(priv), (void *)txq);
+			ETH_DEV(priv)->data->tx_queues[i] = NULL;
 			break;
 		}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:13.919023416 +0100
+++ 0002-net-mlx4-change-device-reference-for-secondary-proce.patch	2019-04-30 17:58:13.746141028 +0100
@@ -1 +1 @@
-From 099c2c5376131b3d352d70f8904e586c0e84651e Mon Sep 17 00:00:00 2001
+From fbc7be121f71629834a60f50d4419932740bddd1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 099c2c5376131b3d352d70f8904e586c0e84651e ]
+
@@ -16,2 +17,0 @@
-Cc: stable@dpdk.org
-
@@ -32 +32 @@
-index 5ef2e7f41..bb6ab8ec6 100644
+index 8aa116cb7..4bc966d5f 100644
@@ -35 +35 @@
-@@ -754,9 +754,9 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
+@@ -753,9 +753,9 @@ mlx4_pci_probe(struct rte_pci_driver *pci_drv, struct rte_pci_device *pci_dev)
@@ -48 +48 @@
-index 7ac49ca67..51566caf7 100644
+index 180e5186c..fc568eb3e 100644
@@ -67 +67 @@
-index f4df4ab1f..038dc71d3 100644
+index f16037d1d..5136d136f 100644
@@ -70 +70 @@
-@@ -774,5 +774,5 @@ fill:
+@@ -768,5 +768,5 @@ fill:
@@ -77 +77 @@
-@@ -803,5 +803,5 @@ fill:
+@@ -797,5 +797,5 @@ fill:
@@ -84 +84 @@
-@@ -1073,6 +1073,6 @@ mlx4_flow_toggle(struct mlx4_priv *priv,
+@@ -1067,6 +1067,6 @@ mlx4_flow_toggle(struct mlx4_priv *priv,
@@ -93 +93 @@
-@@ -1259,5 +1259,5 @@ mlx4_flow_internal_next_vlan(struct mlx4_priv *priv, uint16_t vlan)
+@@ -1253,5 +1253,5 @@ mlx4_flow_internal_next_vlan(struct mlx4_priv *priv, uint16_t vlan)
@@ -100 +100 @@
-@@ -1336,5 +1336,5 @@ mlx4_flow_internal(struct mlx4_priv *priv, struct rte_flow_error *error)
+@@ -1330,5 +1330,5 @@ mlx4_flow_internal(struct mlx4_priv *priv, struct rte_flow_error *error)
@@ -107 +107 @@
-@@ -1358,7 +1358,7 @@ mlx4_flow_internal(struct mlx4_priv *priv, struct rte_flow_error *error)
+@@ -1352,7 +1352,7 @@ mlx4_flow_internal(struct mlx4_priv *priv, struct rte_flow_error *error)
@@ -117 +117 @@
-@@ -1440,5 +1440,5 @@ next_vlan:
+@@ -1434,5 +1434,5 @@ next_vlan:
@@ -124 +124 @@
-@@ -1456,13 +1456,14 @@ next_vlan:
+@@ -1450,13 +1450,14 @@ next_vlan:
@@ -142 +142 @@
-@@ -1478,14 +1479,14 @@ next_vlan:
+@@ -1472,14 +1473,14 @@ next_vlan:
@@ -160 +160 @@
-@@ -1504,5 +1505,6 @@ error:
+@@ -1498,5 +1499,6 @@ error:
@@ -168 +168 @@
-@@ -1542,5 +1544,6 @@ mlx4_flow_sync(struct mlx4_priv *priv, struct rte_flow_error *error)
+@@ -1536,5 +1538,6 @@ mlx4_flow_sync(struct mlx4_priv *priv, struct rte_flow_error *error)
@@ -176 +176 @@
-@@ -1575,5 +1578,5 @@ mlx4_flow_clean(struct mlx4_priv *priv)
+@@ -1569,5 +1572,5 @@ mlx4_flow_clean(struct mlx4_priv *priv)

[dpdk-stable] patch 'net/mlx: remove debug messages on datapath' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 379748c96818b8e8d5c6c740e203918e6b98eafc Mon Sep 17 00:00:00 2001
From: Yongseok Koh <yskoh@mellanox.com>
Date: Mon, 1 Apr 2019 14:17:52 -0700
Subject: [PATCH] net/mlx: remove debug messages on datapath

[ upstream commit 3d1f3c7c8343b43bbb78368cfca7f329b54a19f0 ]

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>
---
 drivers/net/mlx4/mlx4_mr.c | 4 ----
 drivers/net/mlx5/mlx5_mr.c | 6 ------
 2 files changed, 10 deletions(-)

diff --git a/drivers/net/mlx4/mlx4_mr.c b/drivers/net/mlx4/mlx4_mr.c
index e4be46ab2..0d83d81e6 100644
--- a/drivers/net/mlx4/mlx4_mr.c
+++ b/drivers/net/mlx4/mlx4_mr.c
@@ -1027,6 +1027,4 @@ mlx4_rx_addr2mr_bh(struct rxq *rxq, uintptr_t addr)
 	struct mlx4_priv *priv = rxq->priv;
 
-	DEBUG("Rx queue %u: miss on top-half, mru=%u, head=%u, addr=%p",
-	      rxq->stats.idx, mr_ctrl->mru, mr_ctrl->head, (void *)addr);
 	return mlx4_mr_addr2mr_bh(ETH_DEV(priv), mr_ctrl, addr);
 }
@@ -1049,6 +1047,4 @@ mlx4_tx_addr2mr_bh(struct txq *txq, uintptr_t addr)
 	struct mlx4_priv *priv = txq->priv;
 
-	DEBUG("Tx queue %u: miss on top-half, mru=%u, head=%u, addr=%p",
-	      txq->stats.idx, mr_ctrl->mru, mr_ctrl->head, (void *)addr);
 	return mlx4_mr_addr2mr_bh(ETH_DEV(priv), mr_ctrl, addr);
 }
diff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c
index d336a77e4..8aaa87dd6 100644
--- a/drivers/net/mlx5/mlx5_mr.c
+++ b/drivers/net/mlx5/mlx5_mr.c
@@ -1031,7 +1031,4 @@ mlx5_rx_addr2mr_bh(struct mlx5_rxq_data *rxq, uintptr_t addr)
 	struct mlx5_priv *priv = rxq_ctrl->priv;
 
-	DRV_LOG(DEBUG,
-		"Rx queue %u: miss on top-half, mru=%u, head=%u, addr=%p",
-		rxq_ctrl->idx, mr_ctrl->mru, mr_ctrl->head, (void *)addr);
 	return mlx5_mr_addr2mr_bh(ETH_DEV(priv), mr_ctrl, addr);
 }
@@ -1056,7 +1053,4 @@ mlx5_tx_addr2mr_bh(struct mlx5_txq_data *txq, uintptr_t addr)
 	struct mlx5_priv *priv = txq_ctrl->priv;
 
-	DRV_LOG(DEBUG,
-		"Tx queue %u: miss on top-half, mru=%u, head=%u, addr=%p",
-		txq_ctrl->idx, mr_ctrl->mru, mr_ctrl->head, (void *)addr);
 	return mlx5_mr_addr2mr_bh(ETH_DEV(priv), mr_ctrl, addr);
 }
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:13.967518634 +0100
+++ 0003-net-mlx-remove-debug-messages-on-datapath.patch	2019-04-30 17:58:13.749140967 +0100
@@ -1 +1 @@
-From 3d1f3c7c8343b43bbb78368cfca7f329b54a19f0 Mon Sep 17 00:00:00 2001
+From 379748c96818b8e8d5c6c740e203918e6b98eafc Mon Sep 17 00:00:00 2001
@@ -6 +6 @@
-Cc: stable@dpdk.org
+[ upstream commit 3d1f3c7c8343b43bbb78368cfca7f329b54a19f0 ]
@@ -16 +16 @@
-index 01894faec..0ba55fda0 100644
+index e4be46ab2..0d83d81e6 100644
@@ -19 +19 @@
-@@ -1040,6 +1040,4 @@ mlx4_rx_addr2mr_bh(struct rxq *rxq, uintptr_t addr)
+@@ -1027,6 +1027,4 @@ mlx4_rx_addr2mr_bh(struct rxq *rxq, uintptr_t addr)
@@ -26 +26 @@
-@@ -1062,6 +1060,4 @@ mlx4_tx_addr2mr_bh(struct txq *txq, uintptr_t addr)
+@@ -1049,6 +1047,4 @@ mlx4_tx_addr2mr_bh(struct txq *txq, uintptr_t addr)
@@ -34 +34 @@
-index 88484dd50..371887729 100644
+index d336a77e4..8aaa87dd6 100644
@@ -37 +37 @@
-@@ -1032,7 +1032,4 @@ mlx5_rx_addr2mr_bh(struct mlx5_rxq_data *rxq, uintptr_t addr)
+@@ -1031,7 +1031,4 @@ mlx5_rx_addr2mr_bh(struct mlx5_rxq_data *rxq, uintptr_t addr)
@@ -45 +45 @@
-@@ -1057,7 +1054,4 @@ mlx5_tx_addr2mr_bh(struct mlx5_txq_data *txq, uintptr_t addr)
+@@ -1056,7 +1053,4 @@ mlx5_tx_addr2mr_bh(struct mlx5_txq_data *txq, uintptr_t addr)

[dpdk-stable] patch 'net/mlx5: fix external memory registration' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From f9e496d7e040dee9c05bcfcd548ae418ea04e51d Mon Sep 17 00:00:00 2001
From: Yongseok Koh <yskoh@mellanox.com>
Date: Mon, 1 Apr 2019 14:17:53 -0700
Subject: [PATCH] net/mlx5: fix external memory registration

[ upstream commit 207fe7ac72ad4a136a68fb979b7b7525161e4235 ]

Secondary process is not allowed to register MR due to a restriction of
library and kernel driver.

Fixes: 7e43a32ee060 ("net/mlx5: support externally allocated static memory")

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Shahaf Shuler <shahafs@mellanox.com>
---
 doc/guides/nics/mlx5.rst   |  5 +++++
 drivers/net/mlx5/mlx5_mr.c | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index 2dd2b42ee..bfa6cf162 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -86,4 +86,9 @@ Limitations
   - Forked secondary process not supported.
   - All mempools must be initialized before rte_eth_dev_start().
+  - External memory unregistered in EAL memseg list cannot be used for DMA
+    unless such memory has been registered by ``mlx5_mr_update_ext_mp()`` in
+    primary process and remapped to the same virtual address in secondary
+    process. If the external memory is registered by primary process but has
+    different virtual address in secondary process, unexpected error may happen.
 
 - Flow pattern without any specific vlan will match for vlan packets as well:
diff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c
index 8aaa87dd6..e255650ad 100644
--- a/drivers/net/mlx5/mlx5_mr.c
+++ b/drivers/net/mlx5/mlx5_mr.c
@@ -1133,4 +1133,5 @@ mlx5_mr_update_ext_mp_cb(struct rte_mempool *mp, void *opaque,
 	uint32_t lkey;
 
+	assert(rte_eal_process_type() == RTE_PROC_PRIMARY);
 	/* If already registered, it should return. */
 	rte_rwlock_read_lock(&priv->mr.rwlock);
@@ -1234,4 +1235,13 @@ mlx5_tx_update_ext_mp(struct mlx5_txq_data *txq, uintptr_t addr,
 	struct mlx5_priv *priv = txq_ctrl->priv;
 
+	if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
+		DRV_LOG(WARNING,
+			"port %u using address (%p) from unregistered mempool"
+			" having externally allocated memory"
+			" in secondary process, please create mempool"
+			" prior to rte_eth_dev_start()",
+			PORT_ID(priv), (void *)addr);
+		return UINT32_MAX;
+	}
 	mlx5_mr_update_ext_mp(ETH_DEV(priv), mr_ctrl, mp);
 	return mlx5_tx_addr2mr_bh(txq, addr);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.016580016 +0100
+++ 0004-net-mlx5-fix-external-memory-registration.patch	2019-04-30 17:58:13.752140905 +0100
@@ -1 +1 @@
-From 207fe7ac72ad4a136a68fb979b7b7525161e4235 Mon Sep 17 00:00:00 2001
+From f9e496d7e040dee9c05bcfcd548ae418ea04e51d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 207fe7ac72ad4a136a68fb979b7b7525161e4235 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index f4db921f7..fa9bf73da 100644
+index 2dd2b42ee..bfa6cf162 100644
@@ -23 +24 @@
-@@ -87,4 +87,9 @@ Limitations
+@@ -86,4 +86,9 @@ Limitations
@@ -34 +35 @@
-index 371887729..e7f55be6e 100644
+index 8aaa87dd6..e255650ad 100644
@@ -37 +38 @@
-@@ -1186,4 +1186,5 @@ mlx5_mr_update_ext_mp_cb(struct rte_mempool *mp, void *opaque,
+@@ -1133,4 +1133,5 @@ mlx5_mr_update_ext_mp_cb(struct rte_mempool *mp, void *opaque,
@@ -43 +44 @@
-@@ -1401,4 +1402,13 @@ mlx5_tx_update_ext_mp(struct mlx5_txq_data *txq, uintptr_t addr,
+@@ -1234,4 +1235,13 @@ mlx5_tx_update_ext_mp(struct mlx5_txq_data *txq, uintptr_t addr,

[dpdk-stable] patch 'net/sfc: improve TSO header length check in EFX datapath' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 3fe65d2ac9eeb8b99151f07725bbabcdd770c40c Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov@oktetlabs.ru>
Date: Tue, 2 Apr 2019 10:28:33 +0100
Subject: [PATCH] net/sfc: improve TSO header length check in EFX datapath

[ upstream commit ac30699e9cfbb58faeca82ac6d122baf2d61b480 ]

Move the check inside xmit function to the branch in which
the check is mandatory. It makes case when TSO header is not
fragmented a bit more faster.

Fixes: fec33d5bb3eb ("net/sfc: support firmware-assisted TSO")

Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
 drivers/net/sfc/sfc_tso.c | 11 +++++++----
 drivers/net/sfc/sfc_tx.c  |  3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/net/sfc/sfc_tso.c b/drivers/net/sfc/sfc_tso.c
index 076a25d44..a28af0e78 100644
--- a/drivers/net/sfc/sfc_tso.c
+++ b/drivers/net/sfc/sfc_tso.c
@@ -108,8 +108,4 @@ sfc_efx_tso_do(struct sfc_efx_txq *txq, unsigned int idx,
 	idx += SFC_TSO_OPT_DESCS_NUM;
 
-	/* Packets which have too big headers should be discarded */
-	if (unlikely(header_len > SFC_TSOH_STD_LEN))
-		return EMSGSIZE;
-
 	/*
 	 * The TCP header must start at most 208 bytes into the frame.
@@ -130,4 +126,11 @@ sfc_efx_tso_do(struct sfc_efx_txq *txq, unsigned int idx,
 	 */
 	if (m->data_len < header_len) {
+		/*
+		 * Discard a packet if header linearization is needed but
+		 * the header is too big.
+		 */
+		if (unlikely(header_len > SFC_TSOH_STD_LEN))
+			return EMSGSIZE;
+
 		tsoh = txq->sw_ring[idx & txq->ptr_mask].tsoh;
 		sfc_tso_prepare_header(tsoh, header_len, in_seg, in_off);
diff --git a/drivers/net/sfc/sfc_tx.c b/drivers/net/sfc/sfc_tx.c
index aa73d2642..242137e64 100644
--- a/drivers/net/sfc/sfc_tx.c
+++ b/drivers/net/sfc/sfc_tx.c
@@ -738,5 +738,6 @@ sfc_efx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
 				 * one of the following reasons:
 				 *
-				 * 1) Packet header length is greater
+				 * 1) Packet header linearization is needed
+				 *    and the header length is greater
 				 *    than SFC_TSOH_STD_LEN
 				 * 2) TCP header starts at more then
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.061309970 +0100
+++ 0005-net-sfc-improve-TSO-header-length-check-in-EFX-datap.patch	2019-04-30 17:58:13.754140864 +0100
@@ -1 +1 @@
-From ac30699e9cfbb58faeca82ac6d122baf2d61b480 Mon Sep 17 00:00:00 2001
+From 3fe65d2ac9eeb8b99151f07725bbabcdd770c40c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ac30699e9cfbb58faeca82ac6d122baf2d61b480 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -46 +47 @@
-index c3e0936cc..4b1f94ce8 100644
+index aa73d2642..242137e64 100644
@@ -49 +50 @@
-@@ -761,5 +761,6 @@ sfc_efx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)
+@@ -738,5 +738,6 @@ sfc_efx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)

[dpdk-stable] patch 'net/sfc: improve TSO header length check in EF10 datapath' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From cb14d5f1b47112c80699bef60954c39b8a2e81e0 Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov@oktetlabs.ru>
Date: Tue, 2 Apr 2019 10:28:34 +0100
Subject: [PATCH] net/sfc: improve TSO header length check in EF10 datapath

[ upstream commit 3985802ecf7808472bebb3fa2a3809008dae66b9 ]

Move the check inside xmit function to the branch in which
the check is mandatory. It makes case when TSO header is not
fragmented a bit more faster.

Fixes: 6bc985e41155 ("net/sfc: support TSO in EF10 Tx datapath")

Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
---
 drivers/net/sfc/sfc_ef10_tx.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/net/sfc/sfc_ef10_tx.c b/drivers/net/sfc/sfc_ef10_tx.c
index ff6d5b486..cf229f8bb 100644
--- a/drivers/net/sfc/sfc_ef10_tx.c
+++ b/drivers/net/sfc/sfc_ef10_tx.c
@@ -341,7 +341,5 @@ sfc_ef10_xmit_tso_pkt(struct sfc_ef10_txq * const txq, struct rte_mbuf *m_seg,
 	bool eop;
 
-	/* Both checks may be done, so use bit OR to have only one branching */
-	if (unlikely((header_len > SFC_TSOH_STD_LEN) |
-		     (tcph_off > txq->tso_tcp_header_offset_limit)))
+	if (unlikely(tcph_off > txq->tso_tcp_header_offset_limit))
 		return EMSGSIZE;
 
@@ -408,4 +406,11 @@ sfc_ef10_xmit_tso_pkt(struct sfc_ef10_txq * const txq, struct rte_mbuf *m_seg,
 				SFC_TSOH_STD_LEN;
 
+		/*
+		 * Discard a packet if header linearization is needed but
+		 * the header is too big.
+		 */
+		if (unlikely(header_len > SFC_TSOH_STD_LEN))
+			return EMSGSIZE;
+
 		hdr_addr = txq->tsoh + hdr_addr_off;
 		hdr_iova = txq->tsoh_iova + hdr_addr_off;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.109076612 +0100
+++ 0006-net-sfc-improve-TSO-header-length-check-in-EF10-data.patch	2019-04-30 17:58:13.755140844 +0100
@@ -1 +1 @@
-From 3985802ecf7808472bebb3fa2a3809008dae66b9 Mon Sep 17 00:00:00 2001
+From cb14d5f1b47112c80699bef60954c39b8a2e81e0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3985802ecf7808472bebb3fa2a3809008dae66b9 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 0711c1136..97b1b6252 100644
+index ff6d5b486..cf229f8bb 100644

[dpdk-stable] patch 'net: fix Tx VLAN flag for offload emulation' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 8e135dedcfd61b028e8d9ac03a0c7dcf1e04b87d Mon Sep 17 00:00:00 2001
From: Bill Hong <bhong@brocade.com>
Date: Mon, 25 Mar 2019 11:05:41 -0400
Subject: [PATCH] net: fix Tx VLAN flag for offload emulation

[ upstream commit 9ea1b3ccfcfd556ec5144fa91041cf8f86814c5f ]

A PMD might use rte_vlan_insert to implement Tx VLAN offload. Typically
the PMD will insert the VLAN header in the transmit path and then
attempt to send the packets. If this fails, the packets are returned to
the application which may attempt to send these packets again. If the
PKT_TX_VLAN flag is not cleared, the transmit path may attempt to insert
the VLAN header again.

Fixes: 47aa48b969f8 ("net: fix stripped VLAN flag for offload emulation")

Signed-off-by: Bill Hong <bhong@brocade.com>
Signed-off-by: Chas Williams <chas3@att.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 lib/librte_net/rte_ether.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_net/rte_ether.h b/lib/librte_net/rte_ether.h
index c2c5e249f..e0d831113 100644
--- a/lib/librte_net/rte_ether.h
+++ b/lib/librte_net/rte_ether.h
@@ -409,5 +409,5 @@ static inline int rte_vlan_insert(struct rte_mbuf **m)
 	vh->vlan_tci = rte_cpu_to_be_16((*m)->vlan_tci);
 
-	(*m)->ol_flags &= ~PKT_RX_VLAN_STRIPPED;
+	(*m)->ol_flags &= ~(PKT_RX_VLAN_STRIPPED | PKT_TX_VLAN);
 
 	return 0;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.152529979 +0100
+++ 0007-net-fix-Tx-VLAN-flag-for-offload-emulation.patch	2019-04-30 17:58:13.756140824 +0100
@@ -1 +1 @@
-From 9ea1b3ccfcfd556ec5144fa91041cf8f86814c5f Mon Sep 17 00:00:00 2001
+From 8e135dedcfd61b028e8d9ac03a0c7dcf1e04b87d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9ea1b3ccfcfd556ec5144fa91041cf8f86814c5f ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -24 +25 @@
-index 54822df75..3a87ff184 100644
+index c2c5e249f..e0d831113 100644
@@ -27 +28 @@
-@@ -411,5 +411,5 @@ static inline int rte_vlan_insert(struct rte_mbuf **m)
+@@ -409,5 +409,5 @@ static inline int rte_vlan_insert(struct rte_mbuf **m)

[dpdk-stable] patch 'app/testpmd: fix Tx VLAN and QinQ dependency' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 715a10099da8c410e5b3a9156818324d6d158dbb Mon Sep 17 00:00:00 2001
From: Nithin Dabilpuram <ndabilpuram@marvell.com>
Date: Fri, 5 Apr 2019 07:36:21 +0000
Subject: [PATCH] app/testpmd: fix Tx VLAN and QinQ dependency

[ upstream commit 368ba98aead8fc1c84e65cbf43338b4bcc856364 ]

Tx VLAN & QinQ insert enable need not depend on
Rx VLAN offload ETH_VLAN_EXTEND_OFFLOAD. For Tx VLAN
insert enable, error check is now to see if QinQ was enabled
but only single VLAN id is set.

Fixes: 6a34f91690d0 ("app/testpmd: fix error message when setting Tx VLAN")

Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 app/test-pmd/config.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index b9e5dd923..5397acbd1 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -2956,5 +2956,4 @@ void
 tx_vlan_set(portid_t port_id, uint16_t vlan_id)
 {
-	int vlan_offload;
 	struct rte_eth_dev_info dev_info;
 
@@ -2964,6 +2963,6 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id)
 		return;
 
-	vlan_offload = rte_eth_dev_get_vlan_offload(port_id);
-	if (vlan_offload & ETH_VLAN_EXTEND_OFFLOAD) {
+	if (ports[port_id].dev_conf.txmode.offloads &
+	    DEV_TX_OFFLOAD_QINQ_INSERT) {
 		printf("Error, as QinQ has been enabled.\n");
 		return;
@@ -2984,5 +2983,4 @@ void
 tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
 {
-	int vlan_offload;
 	struct rte_eth_dev_info dev_info;
 
@@ -2994,9 +2992,4 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
 		return;
 
-	vlan_offload = rte_eth_dev_get_vlan_offload(port_id);
-	if (!(vlan_offload & ETH_VLAN_EXTEND_OFFLOAD)) {
-		printf("Error, as QinQ hasn't been enabled.\n");
-		return;
-	}
 	rte_eth_dev_info_get(port_id, &dev_info);
 	if ((dev_info.tx_offload_capa & DEV_TX_OFFLOAD_QINQ_INSERT) == 0) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.198035581 +0100
+++ 0008-app-testpmd-fix-Tx-VLAN-and-QinQ-dependency.patch	2019-04-30 17:58:13.760140742 +0100
@@ -1 +1 @@
-From 368ba98aead8fc1c84e65cbf43338b4bcc856364 Mon Sep 17 00:00:00 2001
+From 715a10099da8c410e5b3a9156818324d6d158dbb Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 368ba98aead8fc1c84e65cbf43338b4bcc856364 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index cadcb512f..010e26d4c 100644
+index b9e5dd923..5397acbd1 100644
@@ -25 +26 @@
-@@ -2963,5 +2963,4 @@ void
+@@ -2956,5 +2956,4 @@ void
@@ -31 +32 @@
-@@ -2971,6 +2970,6 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id)
+@@ -2964,6 +2963,6 @@ tx_vlan_set(portid_t port_id, uint16_t vlan_id)
@@ -40 +41 @@
-@@ -2991,5 +2990,4 @@ void
+@@ -2984,5 +2983,4 @@ void
@@ -46 +47 @@
-@@ -3001,9 +2999,4 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
+@@ -2994,9 +2992,4 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)

[dpdk-stable] patch 'app/testpmd: fix Tx QinQ set' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From c469a27cf315c2caa9ab9f01fd3ed8ad649905bf Mon Sep 17 00:00:00 2001
From: Nithin Dabilpuram <ndabilpuram@marvell.com>
Date: Fri, 5 Apr 2019 07:36:24 +0000
Subject: [PATCH] app/testpmd: fix Tx QinQ set

[ upstream commit 6b1ad5181c7dc10119238e8798bbc96c9d83d1fc ]

Enable DEV_TX_OFFLOAD_VLAN_INSERT also along with
DEV_TX_OFFLOAD_VLAN_QINQ in tx_qinq_set() as it takes
both vlan id's as arguments.

Fixes: 597f9fafe13b ("app/testpmd: convert to new Tx offloads API")

Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 app/test-pmd/config.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 5397acbd1..4004e3a49 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -3000,5 +3000,6 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
 
 	tx_vlan_reset(port_id);
-	ports[port_id].dev_conf.txmode.offloads |= DEV_TX_OFFLOAD_QINQ_INSERT;
+	ports[port_id].dev_conf.txmode.offloads |= (DEV_TX_OFFLOAD_VLAN_INSERT |
+						    DEV_TX_OFFLOAD_QINQ_INSERT);
 	ports[port_id].tx_vlan_id = vlan_id;
 	ports[port_id].tx_vlan_id_outer = vlan_id_outer;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.244429207 +0100
+++ 0009-app-testpmd-fix-Tx-QinQ-set.patch	2019-04-30 17:58:13.764140660 +0100
@@ -1 +1 @@
-From 6b1ad5181c7dc10119238e8798bbc96c9d83d1fc Mon Sep 17 00:00:00 2001
+From c469a27cf315c2caa9ab9f01fd3ed8ad649905bf Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6b1ad5181c7dc10119238e8798bbc96c9d83d1fc ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 010e26d4c..f9cb12964 100644
+index 5397acbd1..4004e3a49 100644
@@ -24 +25 @@
-@@ -3007,5 +3007,6 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)
+@@ -3000,5 +3000,6 @@ tx_qinq_set(portid_t port_id, uint16_t vlan_id, uint16_t vlan_id_outer)

[dpdk-stable] patch 'table: fix arm64 hash function selection' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 4835547e25085c53b0dd5951435dc19445da2a53 Mon Sep 17 00:00:00 2001
From: Jerin Jacob <jerinj@marvell.com>
Date: Sat, 6 Apr 2019 13:29:41 +0000
Subject: [PATCH] table: fix arm64 hash function selection

[ upstream commit e3eb65cab308508883139b2b79c8348ec0682eec ]

Use CRC32 instruction only when it is available to avoid
the build issue like below.

{standard input}:16: Error:
selected processor does not support `crc32cx w3,w3,x0'

Fixes: ea7be0a0386e ("lib/librte_table: add hash function headers")

Signed-off-by: Jerin Jacob <jerinj@marvell.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
---
 lib/librte_table/rte_table_hash_func.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/librte_table/rte_table_hash_func.h b/lib/librte_table/rte_table_hash_func.h
index 02296eabe..11ea5a90e 100644
--- a/lib/librte_table/rte_table_hash_func.h
+++ b/lib/librte_table/rte_table_hash_func.h
@@ -41,5 +41,5 @@ rte_crc32_u64(uint64_t crc, uint64_t v)
 }
 
-#elif defined(RTE_ARCH_ARM64)
+#elif defined(RTE_ARCH_ARM64) && defined(RTE_MACHINE_CPUFLAG_CRC32)
 #include "rte_table_hash_func_arm64.h"
 #else
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.295165546 +0100
+++ 0010-table-fix-arm64-hash-function-selection.patch	2019-04-30 17:58:13.765140639 +0100
@@ -1 +1 @@
-From e3eb65cab308508883139b2b79c8348ec0682eec Mon Sep 17 00:00:00 2001
+From 4835547e25085c53b0dd5951435dc19445da2a53 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e3eb65cab308508883139b2b79c8348ec0682eec ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'net/nfp: fix file descriptor check' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 879ff47425747012e59a9172f7f9adf6d33e8241 Mon Sep 17 00:00:00 2001
From: Alejandro Lucero <alejandro.lucero@netronome.com>
Date: Mon, 8 Apr 2019 10:20:40 +0100
Subject: [PATCH] net/nfp: fix file descriptor check

[ upstream commit 0c08589d9eeaef341e154b2ddbc29699dbd16e17 ]

Although it is rather unlikely getting 0 as the descriptor handle, better
to contemplate that possibility.

Coverity issue: 195018
Fixes: 896c265ef954 ("net/nfp: use new CPP interface")

Signed-off-by: Alejandro Lucero <alejandro.lucero@netronome.com>
---
 drivers/net/nfp/nfp_net.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index 99c9b46e8..49d4e2bd5 100644
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -3036,5 +3036,5 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card)
 	PMD_DRV_LOG(DEBUG, "Trying with fw file: %s", fw_name);
 	fw_f = open(fw_name, O_RDONLY);
-	if (fw_f > 0)
+	if (fw_f >= 0)
 		goto read_fw;
 
@@ -3045,5 +3045,5 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card)
 	PMD_DRV_LOG(DEBUG, "Trying with fw file: %s", fw_name);
 	fw_f = open(fw_name, O_RDONLY);
-	if (fw_f > 0)
+	if (fw_f >= 0)
 		goto read_fw;
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.338450234 +0100
+++ 0011-net-nfp-fix-file-descriptor-check.patch	2019-04-30 17:58:13.769140557 +0100
@@ -1 +1 @@
-From 0c08589d9eeaef341e154b2ddbc29699dbd16e17 Mon Sep 17 00:00:00 2001
+From 879ff47425747012e59a9172f7f9adf6d33e8241 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0c08589d9eeaef341e154b2ddbc29699dbd16e17 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 3e6178c7b..50058e056 100644
+index 99c9b46e8..49d4e2bd5 100644
@@ -22 +23 @@
-@@ -3492,5 +3492,5 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card)
+@@ -3036,5 +3036,5 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card)
@@ -29 +30 @@
-@@ -3501,5 +3501,5 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card)
+@@ -3045,5 +3045,5 @@ nfp_fw_upload(struct rte_pci_device *dev, struct nfp_nsp *nsp, char *card)

[dpdk-stable] patch 'net/nfp: fix potential integer overflow' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 0f39eac8640f9eb952e3e4f5986d39de7712ee64 Mon Sep 17 00:00:00 2001
From: Alejandro Lucero <alejandro.lucero@netronome.com>
Date: Mon, 8 Apr 2019 10:39:56 +0100
Subject: [PATCH] net/nfp: fix potential integer overflow

[ upstream commit 3243f7c0d8e445fe7607a2dcac24bffffa830cae ]

Coverity issue: 277204
Fixes: defb9a5dd156 ("nfp: introduce driver initialization")

Signed-off-by: Alejandro Lucero <alejandro.lucero@netronome.com>
---
 drivers/net/nfp/nfp_net.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index 49d4e2bd5..7d99f080a 100644
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -2793,7 +2793,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
 	case PCI_DEVICE_ID_NFP6000_VF_NIC:
 		start_q = nn_cfg_readl(hw, NFP_NET_CFG_START_TXQ);
-		tx_bar_off = start_q * NFP_QCP_QUEUE_ADDR_SZ;
+		tx_bar_off = (uint64_t)start_q * NFP_QCP_QUEUE_ADDR_SZ;
 		start_q = nn_cfg_readl(hw, NFP_NET_CFG_START_RXQ);
-		rx_bar_off = start_q * NFP_QCP_QUEUE_ADDR_SZ;
+		rx_bar_off = (uint64_t)start_q * NFP_QCP_QUEUE_ADDR_SZ;
 		break;
 	default:
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.389413446 +0100
+++ 0012-net-nfp-fix-potential-integer-overflow.patch	2019-04-30 17:58:13.772140496 +0100
@@ -1 +1 @@
-From 3243f7c0d8e445fe7607a2dcac24bffffa830cae Mon Sep 17 00:00:00 2001
+From 0f39eac8640f9eb952e3e4f5986d39de7712ee64 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3243f7c0d8e445fe7607a2dcac24bffffa830cae ]
+
@@ -8 +9,0 @@
-Cc: stable@dpdk.org
@@ -16 +17 @@
-index 50058e056..d4c94d7cc 100644
+index 49d4e2bd5..7d99f080a 100644
@@ -19 +20 @@
-@@ -2856,7 +2856,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)
+@@ -2793,7 +2793,7 @@ nfp_net_init(struct rte_eth_dev *eth_dev)

[dpdk-stable] patch 'net/nfp: check return value' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 3bc53e57eb490367840991d1fa08eb1fdf6ed41e Mon Sep 17 00:00:00 2001
From: Alejandro Lucero <alejandro.lucero@netronome.com>
Date: Mon, 8 Apr 2019 10:59:49 +0100
Subject: [PATCH] net/nfp: check return value

[ upstream commit 0fec453d583c77fd0e7fb61a0284dc261f2b50e3 ]

Call to CPP read (nfp_cpp_readl()) can fail, return 0 on fail.

If the call to _nfp6000_cppat_mu_locality fails, the function needs
to return with an error.

If the nfp_cpp_readl() call fails just returns 0.

Coverity issue: 277209, 277215, 277225
Fixes: c7e9729da6b5 ("net/nfp: support CPP")

Signed-off-by: Alejandro Lucero <alejandro.lucero@netronome.com>
---
 drivers/net/nfp/nfpcore/nfp-common/nfp_cppat.h | 3 +++
 drivers/net/nfp/nfpcore/nfp_cppcore.c          | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/net/nfp/nfpcore/nfp-common/nfp_cppat.h b/drivers/net/nfp/nfpcore/nfp-common/nfp_cppat.h
index 6e380cca0..538f882bf 100644
--- a/drivers/net/nfp/nfpcore/nfp-common/nfp_cppat.h
+++ b/drivers/net/nfp/nfpcore/nfp-common/nfp_cppat.h
@@ -369,4 +369,7 @@ _nfp6000_encode_mu(uint64_t *addr, int dest_island, int mode, int addr40,
 	locality_lsb = _nfp6000_cppat_mu_locality_lsb(mode, addr40);
 
+	if (locality_lsb < 0)
+		return NFP_ERRNO(EINVAL);
+
 	if (((*addr >> locality_lsb) & 3) == _NIC_NFP6000_MU_LOCALITY_DIRECT)
 		da = 1;
diff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c
index 75d3c9748..dec4a8b6d 100644
--- a/drivers/net/nfp/nfpcore/nfp_cppcore.c
+++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c
@@ -802,5 +802,6 @@ __nfp_cpp_model_autodetect(struct nfp_cpp *cpp)
 	uint32_t model = 0;
 
-	nfp_cpp_readl(cpp, arm_id, NFP6000_ARM_GCSR_SOFTMODEL0, &model);
+	if (nfp_cpp_readl(cpp, arm_id, NFP6000_ARM_GCSR_SOFTMODEL0, &model))
+		return 0;
 
 	if (NFP_CPP_MODEL_IS_6000(model)) {
@@ -811,6 +812,8 @@ __nfp_cpp_model_autodetect(struct nfp_cpp *cpp)
 		/* The PL's PluDeviceID revision code is authoratative */
 		model &= ~0xff;
-		nfp_xpb_readl(cpp, NFP_XPB_DEVICE(1, 1, 16) +
-				   NFP_PL_DEVICE_ID, &tmp);
+		if (nfp_xpb_readl(cpp, NFP_XPB_DEVICE(1, 1, 16) +
+				   NFP_PL_DEVICE_ID, &tmp))
+			return 0;
+
 		model |= (NFP_PL_DEVICE_ID_MASK & tmp) - 0x10;
 	}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.436205965 +0100
+++ 0013-net-nfp-check-return-value.patch	2019-04-30 17:58:13.774140455 +0100
@@ -1 +1 @@
-From 0fec453d583c77fd0e7fb61a0284dc261f2b50e3 Mon Sep 17 00:00:00 2001
+From 3bc53e57eb490367840991d1fa08eb1fdf6ed41e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0fec453d583c77fd0e7fb61a0284dc261f2b50e3 ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'net/nfp: fix memory leak' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From e2b9a9571112f2a742a66be287d3b6c86ec0759e Mon Sep 17 00:00:00 2001
From: Alejandro Lucero <alejandro.lucero@netronome.com>
Date: Mon, 8 Apr 2019 11:19:29 +0100
Subject: [PATCH] net/nfp: fix memory leak

[ upstream commit 318e737d2d04899733539c63aab84bf0b2cf0552 ]

If errors, release the allocated structure.

Coverity issue: 277222
Fixes: c7e9729da6b5 ("net/nfp: support CPP")

Signed-off-by: Alejandro Lucero <alejandro.lucero@netronome.com>
---
 drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c
index 6dfa3e302..37b7991f0 100644
--- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c
+++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c
@@ -791,15 +791,15 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev)
 		ret = nfp_acquire_process_lock(desc);
 		if (ret)
-			return -1;
+			goto error;
 	}
 
 	if (nfp6000_set_model(dev, cpp) < 0)
-		return -1;
+		goto error;
 	if (nfp6000_set_interface(dev, cpp) < 0)
-		return -1;
+		goto error;
 	if (nfp6000_set_serial(dev, cpp) < 0)
-		return -1;
+		goto error;
 	if (nfp6000_set_barsz(dev, desc) < 0)
-		return -1;
+		goto error;
 
 	desc->cfg = (char *)dev->mem_resource[0].addr;
@@ -812,5 +812,9 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev)
 	nfp_cpp_model_set(cpp, model);
 
-	return ret;
+	return 0;
+
+error:
+	free(desc);
+	return -1;
 }
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.484636993 +0100
+++ 0014-net-nfp-fix-memory-leak.patch	2019-04-30 17:58:13.775140435 +0100
@@ -1 +1 @@
-From 318e737d2d04899733539c63aab84bf0b2cf0552 Mon Sep 17 00:00:00 2001
+From e2b9a9571112f2a742a66be287d3b6c86ec0759e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 318e737d2d04899733539c63aab84bf0b2cf0552 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -14,2 +15,2 @@
- drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 18 +++++++++++-------
- 1 file changed, 11 insertions(+), 7 deletions(-)
+ drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
@@ -18 +19 @@
-index 93ee310f5..33baa989b 100644
+index 6dfa3e302..37b7991f0 100644
@@ -21 +22 @@
-@@ -866,5 +866,5 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev)
+@@ -791,15 +791,15 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev)
@@ -28,7 +28,0 @@
-@@ -873,15 +873,15 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev)
- 		ret = nfp_acquire_secondary_process_lock(desc);
- 		if (ret)
--			return -1;
-+			goto error;
- 	}
- 
@@ -49,2 +43,2 @@
-@@ -891,5 +891,9 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev)
- 	nfp_cpp_priv_set(cpp, desc);
+@@ -812,5 +812,9 @@ nfp6000_init(struct nfp_cpp *cpp, struct rte_pci_device *dev)
+ 	nfp_cpp_model_set(cpp, model);

[dpdk-stable] patch 'app/testpmd: fix mempool free on exit' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 22c214874fba5f426a787ae95fcb8196268c5cde Mon Sep 17 00:00:00 2001
From: Shahaf Shuler <shahafs@mellanox.com>
Date: Sun, 7 Apr 2019 08:02:24 +0300
Subject: [PATCH] app/testpmd: fix mempool free on exit

[ upstream commit 401b744da2cf0f87991127e5b422cde6cde3d726 ]

Allocated mempools were never free. it is bad practice.

Fixes: af75078fece3 ("first public release")

Signed-off-by: Shahaf Shuler <shahafs@mellanox.com>
Acked-by: Bernard Iremonger <bernard.iremonger@intel.com>
---
 app/test-pmd/testpmd.c | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 55a4ee407..27b3c1183 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -189,4 +189,6 @@ struct fwd_engine * fwd_engines[] = {
 };
 
+struct rte_mempool *mempools[RTE_MAX_NUMA_NODES];
+
 struct fwd_config cur_fwd_config;
 struct fwd_engine *cur_fwd_eng = &io_fwd_engine; /**< IO mode by default. */
@@ -845,5 +847,5 @@ setup_extmem(uint32_t nb_mbufs, uint32_t mbuf_sz, bool huge)
  * Configuration initialisation done once at init time.
  */
-static void
+static struct rte_mempool *
 mbuf_pool_create(uint16_t mbuf_seg_size, unsigned nb_mbuf,
 		 unsigned int socket_id)
@@ -923,4 +925,5 @@ err:
 		rte_mempool_dump(stdout, rte_mp);
 	}
+	return rte_mp;
 }
 
@@ -1140,12 +1143,16 @@ init_config(void)
 
 		for (i = 0; i < num_sockets; i++)
-			mbuf_pool_create(mbuf_data_size, nb_mbuf_per_pool,
-					 socket_ids[i]);
+			mempools[i] = mbuf_pool_create(mbuf_data_size,
+						       nb_mbuf_per_pool,
+						       socket_ids[i]);
 	} else {
 		if (socket_num == UMA_NO_CONFIG)
-			mbuf_pool_create(mbuf_data_size, nb_mbuf_per_pool, 0);
+			mempools[0] = mbuf_pool_create(mbuf_data_size,
+						       nb_mbuf_per_pool, 0);
 		else
-			mbuf_pool_create(mbuf_data_size, nb_mbuf_per_pool,
-						 socket_num);
+			mempools[socket_num] = mbuf_pool_create
+							(mbuf_data_size,
+							 nb_mbuf_per_pool,
+							 socket_num);
 	}
 
@@ -2385,4 +2392,5 @@ pmd_test_exit(void)
 	portid_t pt_id;
 	int ret;
+	int i;
 
 	if (test_done == 0)
@@ -2438,4 +2446,8 @@ pmd_test_exit(void)
 		}
 	}
+	for (i = 0 ; i < RTE_MAX_NUMA_NODES ; i++) {
+		if (mempools[i])
+			rte_mempool_free(mempools[i]);
+	}
 
 	printf("\nBye...\n");
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.527667970 +0100
+++ 0015-app-testpmd-fix-mempool-free-on-exit.patch	2019-04-30 17:58:13.779140353 +0100
@@ -1 +1 @@
-From 401b744da2cf0f87991127e5b422cde6cde3d726 Mon Sep 17 00:00:00 2001
+From 22c214874fba5f426a787ae95fcb8196268c5cde Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 401b744da2cf0f87991127e5b422cde6cde3d726 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index aeaa74c98..b7f70b0c4 100644
+index 55a4ee407..27b3c1183 100644
@@ -28 +29 @@
-@@ -836,5 +838,5 @@ setup_extmem(uint32_t nb_mbufs, uint32_t mbuf_sz, bool huge)
+@@ -845,5 +847,5 @@ setup_extmem(uint32_t nb_mbufs, uint32_t mbuf_sz, bool huge)
@@ -35 +36 @@
-@@ -914,4 +916,5 @@ err:
+@@ -923,4 +925,5 @@ err:
@@ -41 +42 @@
-@@ -1131,12 +1134,16 @@ init_config(void)
+@@ -1140,12 +1143,16 @@ init_config(void)
@@ -63 +64 @@
-@@ -2395,4 +2402,5 @@ pmd_test_exit(void)
+@@ -2385,4 +2392,5 @@ pmd_test_exit(void)
@@ -69 +70 @@
-@@ -2448,4 +2456,8 @@ pmd_test_exit(void)
+@@ -2438,4 +2446,8 @@ pmd_test_exit(void)

[dpdk-stable] patch 'app/testpmd: fix hex string parser support for flow API' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 7548453b0461ea73824d2d2771d2c4db0af64e7d Mon Sep 17 00:00:00 2001
From: Wei Zhao <wei.zhao1@intel.com>
Date: Tue, 9 Apr 2019 16:41:31 +0800
Subject: [PATCH] app/testpmd: fix hex string parser support for flow API

[ upstream commit 169a9fed1f4cbca7e432fdc9ad1d44922ad783f6 ]

There is need for users to set configuration of HEX number for RSS
key. The key byte should be pass down as hex number not as char
string. This patch enable cmdline flow parse HEX number,
in order to not using string which pass ASIC number.

Fixes: f4d623f96119 ("app/testpmd: fix missing RSS fields in flow action")

Signed-off-by: Wei Zhao <wei.zhao1@intel.com>
Tested-by: Yuan Peng <yuan.peng@intel.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 app/test-pmd/cmdline_flow.c | 128 +++++++++++++++++++++++++++++++++++-
 1 file changed, 127 insertions(+), 1 deletion(-)

diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
index 5c0108fa7..d202566b2 100644
--- a/app/test-pmd/cmdline_flow.c
+++ b/app/test-pmd/cmdline_flow.c
@@ -36,4 +36,5 @@ enum index {
 	BOOLEAN,
 	STRING,
+	HEX,
 	MAC_ADDR,
 	IPV4_ADDR,
@@ -1123,4 +1124,7 @@ static int parse_string(struct context *, const struct token *,
 			const char *, unsigned int,
 			void *, unsigned int);
+static int parse_hex(struct context *ctx, const struct token *token,
+			const char *str, unsigned int len,
+			void *buf, unsigned int size);
 static int parse_mac_addr(struct context *, const struct token *,
 			  const char *, unsigned int,
@@ -1199,4 +1203,11 @@ static const struct token token_list[] = {
 		.comp = comp_none,
 	},
+	[HEX] = {
+		.name = "{hex}",
+		.type = "HEX",
+		.help = "fixed string",
+		.call = parse_hex,
+		.comp = comp_none,
+	},
 	[MAC_ADDR] = {
 		.name = "{MAC address}",
@@ -2307,5 +2318,5 @@ static const struct token token_list[] = {
 		.name = "key",
 		.help = "RSS hash key",
-		.next = NEXT(action_rss, NEXT_ENTRY(STRING)),
+		.next = NEXT(action_rss, NEXT_ENTRY(HEX)),
 		.args = ARGS(ARGS_ENTRY_ARB(0, 0),
 			     ARGS_ENTRY_ARB
@@ -4442,4 +4453,119 @@ error:
 }
 
+static int
+parse_hex_string(const char *src, uint8_t *dst, uint32_t *size)
+{
+	char *c = NULL;
+	uint32_t i, len;
+	char tmp[3];
+
+	/* Check input parameters */
+	if ((src == NULL) ||
+		(dst == NULL) ||
+		(size == NULL) ||
+		(*size == 0))
+		return -1;
+
+	/* Convert chars to bytes */
+	for (i = 0, len = 0; i < *size; i += 2) {
+		snprintf(tmp, 3, "%s", src + i);
+		dst[len++] = strtoul(tmp, &c, 16);
+		if (*c != 0) {
+			len--;
+			dst[len] = 0;
+			*size = len;
+			return -1;
+		}
+	}
+	dst[len] = 0;
+	*size = len;
+
+	return 0;
+}
+
+static int
+parse_hex(struct context *ctx, const struct token *token,
+		const char *str, unsigned int len,
+		void *buf, unsigned int size)
+{
+	const struct arg *arg_data = pop_args(ctx);
+	const struct arg *arg_len = pop_args(ctx);
+	const struct arg *arg_addr = pop_args(ctx);
+	char tmp[16]; /* Ought to be enough. */
+	int ret;
+	unsigned int hexlen = len;
+	unsigned int length = 256;
+	uint8_t hex_tmp[length];
+
+	/* Arguments are expected. */
+	if (!arg_data)
+		return -1;
+	if (!arg_len) {
+		push_args(ctx, arg_data);
+		return -1;
+	}
+	if (!arg_addr) {
+		push_args(ctx, arg_len);
+		push_args(ctx, arg_data);
+		return -1;
+	}
+	size = arg_data->size;
+	/* Bit-mask fill is not supported. */
+	if (arg_data->mask)
+		goto error;
+	if (!ctx->object)
+		return len;
+
+	/* translate bytes string to array. */
+	if (str[0] == '0' && ((str[1] == 'x') ||
+			(str[1] == 'X'))) {
+		str += 2;
+		hexlen -= 2;
+	}
+	if (hexlen > length)
+		return -1;
+	ret = parse_hex_string(str, hex_tmp, &hexlen);
+	if (ret < 0)
+		goto error;
+	/* Let parse_int() fill length information first. */
+	ret = snprintf(tmp, sizeof(tmp), "%u", hexlen);
+	if (ret < 0)
+		goto error;
+	push_args(ctx, arg_len);
+	ret = parse_int(ctx, token, tmp, ret, NULL, 0);
+	if (ret < 0) {
+		pop_args(ctx);
+		goto error;
+	}
+	buf = (uint8_t *)ctx->object + arg_data->offset;
+	/* Output buffer is not necessarily NUL-terminated. */
+	memcpy(buf, hex_tmp, hexlen);
+	memset((uint8_t *)buf + hexlen, 0x00, size - hexlen);
+	if (ctx->objmask)
+		memset((uint8_t *)ctx->objmask + arg_data->offset,
+					0xff, hexlen);
+	/* Save address if requested. */
+	if (arg_addr->size) {
+		memcpy((uint8_t *)ctx->object + arg_addr->offset,
+		       (void *[]){
+			(uint8_t *)ctx->object + arg_data->offset
+		       },
+		       arg_addr->size);
+		if (ctx->objmask)
+			memcpy((uint8_t *)ctx->objmask + arg_addr->offset,
+			       (void *[]){
+				(uint8_t *)ctx->objmask + arg_data->offset
+			       },
+			       arg_addr->size);
+	}
+	return len;
+error:
+	push_args(ctx, arg_addr);
+	push_args(ctx, arg_len);
+	push_args(ctx, arg_data);
+	return -1;
+
+}
+
 /**
  * Parse a MAC address.
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.577048644 +0100
+++ 0016-app-testpmd-fix-hex-string-parser-support-for-flow-A.patch	2019-04-30 17:58:13.784140250 +0100
@@ -1 +1 @@
-From 169a9fed1f4cbca7e432fdc9ad1d44922ad783f6 Mon Sep 17 00:00:00 2001
+From 7548453b0461ea73824d2d2771d2c4db0af64e7d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 169a9fed1f4cbca7e432fdc9ad1d44922ad783f6 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index 1c83bc9bc..54ff1753c 100644
+index 5c0108fa7..d202566b2 100644
@@ -25 +26 @@
-@@ -37,4 +37,5 @@ enum index {
+@@ -36,4 +36,5 @@ enum index {
@@ -31 +32 @@
-@@ -1124,4 +1125,7 @@ static int parse_string(struct context *, const struct token *,
+@@ -1123,4 +1124,7 @@ static int parse_string(struct context *, const struct token *,
@@ -39 +40 @@
-@@ -1200,4 +1204,11 @@ static const struct token token_list[] = {
+@@ -1199,4 +1203,11 @@ static const struct token token_list[] = {
@@ -51 +52 @@
-@@ -2308,5 +2319,5 @@ static const struct token token_list[] = {
+@@ -2307,5 +2318,5 @@ static const struct token token_list[] = {
@@ -58 +59 @@
-@@ -4477,4 +4488,119 @@ error:
+@@ -4442,4 +4453,119 @@ error:

[dpdk-stable] patch 'app/testpmd: fix return value check' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From b40c5764bd58bca3738300635f009f8889d87dc1 Mon Sep 17 00:00:00 2001
From: Chenbo Xia <chenbo.xia@intel.com>
Date: Wed, 10 Apr 2019 02:46:36 +0000
Subject: [PATCH] app/testpmd: fix return value check

[ upstream commit 2b0e0eba2c37a1d53bf179c2e676eb920a6ac85c ]

Fix unchecked return value issue for rte_eth_dev_configure.

Coverity issue: 195021
Fixes: 2a977b891f99 ("app/testpmd: fix DCB configuration")

Signed-off-by: Chenbo Xia <chenbo.xia@intel.com>
Acked-by: Rami Rosen <ramirose@gmail.com>
---
 app/test-pmd/testpmd.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 27b3c1183..cf983b16b 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2963,6 +2963,7 @@ init_port_dcb_config(portid_t pid,
 
 	/* re-configure the device . */
-	rte_eth_dev_configure(pid, nb_rxq, nb_rxq, &port_conf);
-
+	retval = rte_eth_dev_configure(pid, nb_rxq, nb_rxq, &port_conf);
+	if (retval < 0)
+		return retval;
 	rte_eth_dev_info_get(pid, &rte_port->dev_info);
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.623664380 +0100
+++ 0017-app-testpmd-fix-return-value-check.patch	2019-04-30 17:58:13.788140168 +0100
@@ -1 +1 @@
-From 2b0e0eba2c37a1d53bf179c2e676eb920a6ac85c Mon Sep 17 00:00:00 2001
+From b40c5764bd58bca3738300635f009f8889d87dc1 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2b0e0eba2c37a1d53bf179c2e676eb920a6ac85c ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 2e99d99e1..d01165f3c 100644
+index 27b3c1183..cf983b16b 100644
@@ -22 +23 @@
-@@ -3038,6 +3038,7 @@ init_port_dcb_config(portid_t pid,
+@@ -2963,6 +2963,7 @@ init_port_dcb_config(portid_t pid,

[dpdk-stable] patch 'net/bnxt: fix big endian build' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From d868c78bb1e476aea231879bab68bde25d11a522 Mon Sep 17 00:00:00 2001
From: Somnath Kotur <somnath.kotur@broadcom.com>
Date: Wed, 10 Apr 2019 14:46:22 +0530
Subject: [PATCH] net/bnxt: fix big endian build

[ upstream commit 13856b795362e11c1db20c1a134680653144bd1a ]

The result of the endian conversion was not being used incorrectly.

Fixes: b11cceb83a34 ("net/bnxt: support timesync")

Reported-by: Thomas Monjalon <thomas@monjalon.net>
Signed-off-by: Somnath Kotur <somnath.kotur@broadcom.com>
---
 drivers/net/bnxt/bnxt_ethdev.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index bdc6a1267..e26b9e3ce 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -2650,5 +2650,5 @@ static int bnxt_map_regs(struct bnxt *bp, uint32_t *reg_arr, int count,
 	}
 	win_off = BNXT_GRCPF_REG_WINDOW_BASE_OUT + (reg_win - 1) * 4;
-	rte_cpu_to_le_32(rte_write32(reg_base, (uint8_t *)bp->bar0 + win_off));
+	rte_write32(reg_base, (uint8_t *)bp->bar0 + win_off);
 	return 0;
 }
@@ -2681,8 +2681,8 @@ static int bnxt_map_ptp_regs(struct bnxt *bp)
 static void bnxt_unmap_ptp_regs(struct bnxt *bp)
 {
-	rte_cpu_to_le_32(rte_write32(0, (uint8_t *)bp->bar0 +
-			 BNXT_GRCPF_REG_WINDOW_BASE_OUT + 16));
-	rte_cpu_to_le_32(rte_write32(0, (uint8_t *)bp->bar0 +
-			 BNXT_GRCPF_REG_WINDOW_BASE_OUT + 20));
+	rte_write32(0, (uint8_t *)bp->bar0 +
+			 BNXT_GRCPF_REG_WINDOW_BASE_OUT + 16);
+	rte_write32(0, (uint8_t *)bp->bar0 +
+			 BNXT_GRCPF_REG_WINDOW_BASE_OUT + 20);
 }
 
@@ -2734,6 +2734,6 @@ static int bnxt_get_rx_ts(struct bnxt *bp, uint64_t *ts)
 
 	port_id = pf->port_id;
-	rte_cpu_to_le_32(rte_write32(1 << port_id, (uint8_t *)bp->bar0 +
-	       ptp->rx_mapped_regs[BNXT_PTP_RX_FIFO_ADV]));
+	rte_write32(1 << port_id, (uint8_t *)bp->bar0 +
+	       ptp->rx_mapped_regs[BNXT_PTP_RX_FIFO_ADV]);
 
 	fifo = rte_le_to_cpu_32(rte_read32((uint8_t *)bp->bar0 +
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.671336757 +0100
+++ 0018-net-bnxt-fix-big-endian-build.patch	2019-04-30 17:58:13.792140087 +0100
@@ -1 +1 @@
-From 13856b795362e11c1db20c1a134680653144bd1a Mon Sep 17 00:00:00 2001
+From d868c78bb1e476aea231879bab68bde25d11a522 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 13856b795362e11c1db20c1a134680653144bd1a ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -18 +19 @@
-index 78ab07d0c..da0de211d 100644
+index bdc6a1267..e26b9e3ce 100644

[dpdk-stable] patch 'net/i40e: fix scattered Rx enabling' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From f7763164455b458fce6dc32145e871f4f912b080 Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang@intel.com>
Date: Wed, 27 Mar 2019 19:00:05 +0800
Subject: [PATCH] net/i40e: fix scattered Rx enabling

[ upstream commit 756cea41e9b8108ee8887b63abc357c1f678f480 ]

No need to add additional vlan tag size for max packet size, since
for i40e, the queue's Rx Max Frame Size (rxq->max_pkt_len) already
includes the vlan header size.

Fixes: a3c83a2527e1 ("net/i40e: enable runtime queue setup")
Fixes: 4861cde46116 ("i40e: new poll mode driver")
Fixes: c1715402df8f ("i40evf: fix jumbo frame support")

Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/i40e/i40e_ethdev_vf.c | 3 +--
 drivers/net/i40e/i40e_rxtx.c      | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index 100e71cc8..ae0812bff 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -1725,7 +1725,6 @@ i40evf_rxq_init(struct rte_eth_dev *dev, struct i40e_rx_queue *rxq)
 
 	if ((dev_data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_SCATTER) ||
-	    (rxq->max_pkt_len + 2 * I40E_VLAN_TAG_SIZE) > buf_size) {
+	    rxq->max_pkt_len > buf_size)
 		dev_data->scattered_rx = 1;
-	}
 
 	return 0;
diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c
index 8f727fae6..58ed8145d 100644
--- a/drivers/net/i40e/i40e_rxtx.c
+++ b/drivers/net/i40e/i40e_rxtx.c
@@ -1719,5 +1719,5 @@ i40e_dev_rx_queue_setup_runtime(struct rte_eth_dev *dev,
 			   RTE_PKTMBUF_HEADROOM);
 	int use_scattered_rx =
-		((rxq->max_pkt_len + 2 * I40E_VLAN_TAG_SIZE) > buf_size);
+		(rxq->max_pkt_len > buf_size);
 
 	if (i40e_rx_queue_init(rxq) != I40E_SUCCESS) {
@@ -2709,7 +2709,6 @@ i40e_rx_queue_init(struct i40e_rx_queue *rxq)
 
 	/* Check if scattered RX needs to be used. */
-	if ((rxq->max_pkt_len + 2 * I40E_VLAN_TAG_SIZE) > buf_size) {
+	if (rxq->max_pkt_len > buf_size)
 		dev_data->scattered_rx = 1;
-	}
 
 	/* Init the RX tail regieter. */
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.717553037 +0100
+++ 0019-net-i40e-fix-scattered-Rx-enabling.patch	2019-04-30 17:58:13.798139964 +0100
@@ -1 +1 @@
-From 756cea41e9b8108ee8887b63abc357c1f678f480 Mon Sep 17 00:00:00 2001
+From f7763164455b458fce6dc32145e871f4f912b080 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 756cea41e9b8108ee8887b63abc357c1f678f480 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -22 +23 @@
-index add7b2223..87c45f278 100644
+index 100e71cc8..ae0812bff 100644
@@ -25 +26 @@
-@@ -1786,7 +1786,6 @@ i40evf_rxq_init(struct rte_eth_dev *dev, struct i40e_rx_queue *rxq)
+@@ -1725,7 +1725,6 @@ i40evf_rxq_init(struct rte_eth_dev *dev, struct i40e_rx_queue *rxq)

[dpdk-stable] patch 'doc: fix spelling in testpmd guide' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 96d3e8dc945f035d74497e63211577c1709cc221 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen@networkplumber.org>
Date: Wed, 10 Apr 2019 10:48:56 -0700
Subject: [PATCH] doc: fix spelling in testpmd guide

[ upstream commit 47ae571e015a90329d9a11a4e12558c742f71fe2 ]

Minor spelling errors found with aspell.

Fixes: e76d7a768ce0 ("doc: fix syntax in testpmd user guide")
Fixes: fb73e096110a ("app/testpmd: enable device hotplug monitoring")

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Rami Rosen <ramirose@gmail.com>
---
 doc/guides/testpmd_app_ug/run_app.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst
index 4495ed038..e934b4bed 100644
--- a/doc/guides/testpmd_app_ug/run_app.rst
+++ b/doc/guides/testpmd_app_ug/run_app.rst
@@ -23,5 +23,5 @@ They must be separated from the EAL options, shown in the previous section, with
     sudo ./testpmd -l 0-3 -n 4 -- -i --portmask=0x1 --nb-cores=2
 
-The commandline options are:
+The command line options are:
 
 *   ``-i, --interactive``
@@ -366,5 +366,5 @@ The commandline options are:
 *   ``--hot-plug``
 
-    Enable device event monitor machenism for hotplug.
+    Enable device event monitor mechanism for hot plug.
 
 *   ``--vxlan-gpe-port=N``
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.769330840 +0100
+++ 0020-doc-fix-spelling-in-testpmd-guide.patch	2019-04-30 17:58:13.799139943 +0100
@@ -1 +1 @@
-From 47ae571e015a90329d9a11a4e12558c742f71fe2 Mon Sep 17 00:00:00 2001
+From 96d3e8dc945f035d74497e63211577c1709cc221 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 47ae571e015a90329d9a11a4e12558c742f71fe2 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 7b4341647..89a097d09 100644
+index 4495ed038..e934b4bed 100644
@@ -29 +30 @@
-@@ -370,5 +370,5 @@ The commandline options are:
+@@ -366,5 +366,5 @@ The commandline options are:

[dpdk-stable] patch 'doc: add flow API to qede NIC features' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From aa377a240ae8788675205e43ed6e864137e08a50 Mon Sep 17 00:00:00 2001
From: Shahed Shaikh <shshaikh@marvell.com>
Date: Fri, 12 Apr 2019 03:12:37 -0700
Subject: [PATCH] doc: add flow API to qede NIC features

[ upstream commit ec749e87041e952eb15952cc304351c7a3fffe9f ]

Commit 267d32de46a8 ("net/qede: support generic flow API")
added a support for RTE_FLOW APIs but did not update the feature
support matrix.

Fixes: 267d32de46a8 ("net/qede: support generic flow API")

Signed-off-by: Shahed Shaikh <shshaikh@marvell.com>
---
 doc/guides/nics/features/qede.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/guides/nics/features/qede.ini b/doc/guides/nics/features/qede.ini
index 0d0810021..f69e4f843 100644
--- a/doc/guides/nics/features/qede.ini
+++ b/doc/guides/nics/features/qede.ini
@@ -24,4 +24,5 @@ Tunnel filter        = Y
 Flow director        = Y
 Flow control         = Y
+Flow API             = Y
 CRC offload          = Y
 VLAN offload         = Y
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.813137918 +0100
+++ 0021-doc-add-flow-API-to-qede-NIC-features.patch	2019-04-30 17:58:13.799139943 +0100
@@ -1 +1 @@
-From ec749e87041e952eb15952cc304351c7a3fffe9f Mon Sep 17 00:00:00 2001
+From aa377a240ae8788675205e43ed6e864137e08a50 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit ec749e87041e952eb15952cc304351c7a3fffe9f ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'devtools: accept experimental symbol promotion' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 8c10f57a0c8d949d0639c45665207bce0da77f5b Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 5 Apr 2019 10:17:47 +0200
Subject: [PATCH] devtools: accept experimental symbol promotion

[ upstream commit 3630757803ab2f914ab36bb0285b662b3cff50db ]

Currently, when symbols get promoted from the EXPERIMENTAL section to a
stable ABI section, the script complains they should go to the
EXPERIMENTAL section.

Example:
ERROR: symbol rte_devargs_add is added in the DPDK_19.05 section, but is
expected to be added in the EXPERIMENTAL section of the version map

This is legit.
Moving from a stable ABI to another is also allowed, but must have gone
through the proper process.

Fixes: 4bec48184e33 ("devtools: add checks for ABI symbol addition")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
---
 devtools/check-symbol-change.sh | 43 +++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh
index 8f986a5d7..40eb95322 100755
--- a/devtools/check-symbol-change.sh
+++ b/devtools/check-symbol-change.sh
@@ -106,24 +106,35 @@ check_for_rule_violations()
 			fi
 
-			if [ "$secname" != "EXPERIMENTAL" ]
+			oldsecname=$(sed -n \
+			"s#$mname $symname \(.*\) del#\1#p" "$mapdb")
+
+			# A symbol can not enter a non experimental
+			# section directly
+			if [ $? -ne 0 ] && [ "$secname" != 'EXPERIMENTAL' ]
 			then
-				# Symbols that are getting added in a section
-				# other than the experimental section
-				# to be moving from an already supported
-				# section or its a violation
-				grep -q \
-				"$mname $symname [^EXPERIMENTAL] del" "$mapdb"
-				if [ $? -ne 0 ]
-				then
-					echo -n "ERROR: symbol $symname "
-					echo -n "is added in a section "
-					echo -n "other than the EXPERIMENTAL "
-					echo "section of the version map"
-					ret=1
-				fi
+				echo -n "ERROR: symbol $symname "
+				echo -n "is added in the $secname "
+				echo -n "section, but is expected to "
+				echo -n "be added in the EXPERIMENTAL "
+				echo "section of the version map"
+				ret=1
+				continue
+			fi
+
+			# This symbol is moving between two sections (the
+			# original section is not experimental).
+			# This can be legit, just warn.
+			if [ "$oldsecname" != 'EXPERIMENTAL' ]
+			then
+				echo -n "INFO: symbol $symname is being "
+				echo -n "moved from $oldsecname to $secname. "
+				echo -n "Ensure that it has gone through the "
+				echo "deprecation process"
+				continue
 			fi
 		else
 
-			if [ "$secname" != "EXPERIMENTAL" ]
+			if ! grep -q "$mname $symname .* add" "$mapdb" && \
+			   [ "$secname" != "EXPERIMENTAL" ]
 			then
 				# Just inform users that non-experimenal
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.860604760 +0100
+++ 0022-devtools-accept-experimental-symbol-promotion.patch	2019-04-30 17:58:13.799139943 +0100
@@ -1 +1 @@
-From 3630757803ab2f914ab36bb0285b662b3cff50db Mon Sep 17 00:00:00 2001
+From 8c10f57a0c8d949d0639c45665207bce0da77f5b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3630757803ab2f914ab36bb0285b662b3cff50db ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -24,2 +25,2 @@
- devtools/check-symbol-change.sh | 44 ++++++++++++++++++++-------------
- 1 file changed, 27 insertions(+), 17 deletions(-)
+ devtools/check-symbol-change.sh | 43 +++++++++++++++++++++------------
+ 1 file changed, 27 insertions(+), 16 deletions(-)
@@ -28 +29 @@
-index 020da7ed0..40eb95322 100755
+index 8f986a5d7..40eb95322 100755
@@ -31 +32 @@
-@@ -106,25 +106,35 @@ check_for_rule_violations()
+@@ -106,24 +106,35 @@ check_for_rule_violations()
@@ -51,3 +52,2 @@
--					echo -n "is added in the $secname "
--					echo -n "section, but is expected to "
--					echo -n "be added in the EXPERIMENTAL "
+-					echo -n "is added in a section "
+-					echo -n "other than the EXPERIMENTAL "

[dpdk-stable] patch 'devtools: skip meson build for missing compilers' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From f4d0757d373455873e5019c2925d4d9be8994742 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Wed, 10 Apr 2019 21:52:22 +0100
Subject: [PATCH] devtools: skip meson build for missing compilers

[ upstream commit e887ebb663aa9f1e3ea5d1eb6c3bc4faeb377e66 ]

If either gcc or clang are missing, skip doing those builds.
This allows a setup to only do, e.g. gcc tests.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 devtools/test-meson-builds.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index e59474d53..49bc7876c 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -37,4 +37,5 @@ build () # <directory> <meson options>
 # shared and static linked builds with gcc and clang
 for c in gcc clang ; do
+	command -v $c >/dev/null 2>&1 || continue
 	for s in static shared ; do
 		export CC="ccache $c"
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.910569586 +0100
+++ 0023-devtools-skip-meson-build-for-missing-compilers.patch	2019-04-30 17:58:13.800139923 +0100
@@ -1 +1 @@
-From e887ebb663aa9f1e3ea5d1eb6c3bc4faeb377e66 Mon Sep 17 00:00:00 2001
+From f4d0757d373455873e5019c2925d4d9be8994742 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e887ebb663aa9f1e3ea5d1eb6c3bc4faeb377e66 ]
+
@@ -9,2 +10,0 @@
-Cc: stable@dpdk.org
-
@@ -19 +19 @@
-index b3b5cfbb5..9a67cfa64 100755
+index e59474d53..49bc7876c 100755
@@ -22 +22 @@
-@@ -55,4 +55,5 @@ fi
+@@ -37,4 +37,5 @@ build () # <directory> <meson options>

[dpdk-stable] patch 'devtools: support older compilers with meson test' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 4bef54f37c44582c69e2c20c5c97c6466c643d1c Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Wed, 10 Apr 2019 21:52:23 +0100
Subject: [PATCH] devtools: support older compilers with meson test

[ upstream commit 2660c6f653c11fa37f3385b9f5777f1eff6489c8 ]

Older versions of GCC, such as on Redhat/CentOS 7, don't support
-march=nehalem, but need -march=corei7 instead.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
---
 devtools/test-meson-builds.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index 49bc7876c..79148ba28 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -45,5 +45,10 @@ done
 
 # test compilation with minimal x86 instruction set
-build build-x86-default -Dmachine=nehalem $use_shared
+default_machine='nehalem'
+ok=$(cc -march=$default_machine -E - < /dev/null > /dev/null 2>&1 || echo false)
+if [ "$ok" = "false" ] ; then
+	default_machine='corei7'
+fi
+build build-x86-default -Dmachine=$default_machine $use_shared
 
 # enable cross compilation if gcc cross-compiler is found
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:14.960935857 +0100
+++ 0024-devtools-support-older-compilers-with-meson-test.patch	2019-04-30 17:58:13.800139923 +0100
@@ -1 +1 @@
-From 2660c6f653c11fa37f3385b9f5777f1eff6489c8 Mon Sep 17 00:00:00 2001
+From 4bef54f37c44582c69e2c20c5c97c6466c643d1c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2660c6f653c11fa37f3385b9f5777f1eff6489c8 ]
+
@@ -9,2 +10,0 @@
-Cc: stable@dpdk.org
-
@@ -18 +18 @@
-index 9a67cfa64..c7bde2fb7 100755
+index 49bc7876c..79148ba28 100755
@@ -21 +21 @@
-@@ -63,5 +63,10 @@ done
+@@ -45,5 +45,10 @@ done

[dpdk-stable] patch 'examples/l2fwd-cat: fix build on FreeBSD' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From f9549d04f31dd902fbcc4787d6a1aee988318294 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Tue, 9 Apr 2019 11:55:38 +0100
Subject: [PATCH] examples/l2fwd-cat: fix build on FreeBSD

[ upstream commit d51e5ec7b1a52e841f006794a2451266c3209b50 ]

The definition of CPU_AND differs from Linux to BSD, so we need to use
RTE_CPU_AND instead.

Fixes: f6baccbc2b3b ("examples/l2fwd-cat: add sample application for PQoS CAT and CDP")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
Acked-by: Luca Boccassi <bluca@debian.org>
---
 examples/l2fwd-cat/cat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/l2fwd-cat/cat.c b/examples/l2fwd-cat/cat.c
index a6081e676..502c6b327 100644
--- a/examples/l2fwd-cat/cat.c
+++ b/examples/l2fwd-cat/cat.c
@@ -346,5 +346,5 @@ check_cpus_overlapping(void)
 	for (i = 0; i < m_config_count; i++) {
 		for (j = i + 1; j < m_config_count; j++) {
-			CPU_AND(&mask,
+			RTE_CPU_AND(&mask,
 				&m_config[i].cpumask,
 				&m_config[j].cpumask);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:15.005547351 +0100
+++ 0025-examples-l2fwd-cat-fix-build-on-FreeBSD.patch	2019-04-30 17:58:13.801139902 +0100
@@ -1 +1 @@
-From d51e5ec7b1a52e841f006794a2451266c3209b50 Mon Sep 17 00:00:00 2001
+From f9549d04f31dd902fbcc4787d6a1aee988318294 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d51e5ec7b1a52e841f006794a2451266c3209b50 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'build: use default flags for default Arm machine' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From b59c55cd80579d4546a4414f0c67f61bf9869903 Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Wed, 20 Mar 2019 13:18:01 +0000
Subject: [PATCH] build: use default flags for default Arm machine

[ upstream commit 380154406dc8ce6f46a1c3e4e9fced5ba67644a1 ]

When building for generic distribution we need a stable baseline
architecture, or depending on the build worker the result will vary.

Force the default flags if the user explicitly sets machine=default
at configuration time.

Fixes: b1d48c41189a ("build: support ARM with meson")

Signed-off-by: Luca Boccassi <bluca@debian.org>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
---
 config/arm/meson.build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/arm/meson.build b/config/arm/meson.build
index 45b611151..9feb54f22 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -7,4 +7,5 @@ march_opt = '-march=@0@'.format(machine)
 
 arm_force_native_march = false
+arm_force_default_march = (machine == 'default')
 
 machine_args_generic = [
@@ -106,5 +107,8 @@ else
 	cmd_output = cmd_generic # Set generic by default
 	machine_args = [] # Clear previous machine args
-	if not meson.is_cross_build()
+	if arm_force_default_march and not meson.is_cross_build()
+		machine = impl_generic
+		impl_pn = 'default'
+	elif not meson.is_cross_build()
 		# The script returns ['Implementer', 'Variant', 'Architecture',
 		# 'Primary Part number', 'Revision']
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:15.053218860 +0100
+++ 0026-build-use-default-flags-for-default-Arm-machine.patch	2019-04-30 17:58:13.802139882 +0100
@@ -1 +1 @@
-From 380154406dc8ce6f46a1c3e4e9fced5ba67644a1 Mon Sep 17 00:00:00 2001
+From b59c55cd80579d4546a4414f0c67f61bf9869903 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 380154406dc8ce6f46a1c3e4e9fced5ba67644a1 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index 22a062bad..431f03e56 100644
+index 45b611151..9feb54f22 100644
@@ -31,2 +32,2 @@
- flags_common_default = [
-@@ -121,5 +122,8 @@ else
+ machine_args_generic = [
+@@ -106,5 +107,8 @@ else

[dpdk-stable] patch 'drivers/event: disable OcteonTx for buggy Arm compilers' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 4d6b429642795c4b001daac0736431883724a8f7 Mon Sep 17 00:00:00 2001
From: Yongseok Koh <yskoh@mellanox.com>
Date: Thu, 18 Apr 2019 04:49:00 -0700
Subject: [PATCH] drivers/event: disable OcteonTx for buggy Arm compilers

[ upstream commit 0559d091cc7c80601aa3c9e708276f2e086f5983 ]

Disable octeontx for gcc 4.8.5 as compiler is emitting "internal compiler
error" for aarch64

Fixes: bd77f2d64c44 ("event/octeontx: build with meson")
Fixes: 4f760550a093 ("mk: disable OcteonTx for buggy compilers")
Fixes: f3af3e44a444 ("mk: disable OcteonTx for buggy compilers only on arm64")

Signed-off-by: Yongseok Koh <yskoh@mellanox.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
---
 drivers/event/meson.build | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/event/meson.build b/drivers/event/meson.build
index 836ecbb74..fb723f727 100644
--- a/drivers/event/meson.build
+++ b/drivers/event/meson.build
@@ -2,5 +2,9 @@
 # Copyright(c) 2017 Intel Corporation
 
-drivers = ['dpaa', 'dpaa2', 'octeontx', 'opdl', 'skeleton', 'sw', 'dsw']
+drivers = ['dpaa', 'dpaa2', 'opdl', 'skeleton', 'sw', 'dsw']
+if not (toolchain == 'gcc' and cc.version().version_compare('<4.8.6') and
+	dpdk_conf.has('RTE_ARCH_ARM64'))
+	drivers += 'octeontx'
+endif
 std_deps = ['eventdev', 'kvargs']
 config_flag_fmt = 'RTE_LIBRTE_@0@_EVENTDEV_PMD'
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:15.096680150 +0100
+++ 0027-drivers-event-disable-OcteonTx-for-buggy-Arm-compile.patch	2019-04-30 17:58:13.802139882 +0100
@@ -1 +1 @@
-From 0559d091cc7c80601aa3c9e708276f2e086f5983 Mon Sep 17 00:00:00 2001
+From 4d6b429642795c4b001daac0736431883724a8f7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0559d091cc7c80601aa3c9e708276f2e086f5983 ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'examples/fips_validation: fix CMAC test' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 894eae3b831e752cfe4c2c2343f453a7291e10fa Mon Sep 17 00:00:00 2001
From: Marko Kovacevic <marko.kovacevic@intel.com>
Date: Mon, 15 Apr 2019 16:04:48 +0100
Subject: [PATCH] examples/fips_validation: fix CMAC test

[ upstream commit 083a277754f664d6f5d3af166f1f45ae0cb32cc3 ]

As a result of the cmac test running the test where
PT len is 65536 it should give a result back to the
user USER1: Error -1: Prepare op USER1: PT len 65536
as this MSG len is not supported. Issue was
that the application was not freeing the op properly after
a while causing the app to fail.

CRYPTODEV: rte_cryptodev_sym_session_create() line 1340:
couldn't get object from session mempool
USER1: Error -12: test block
USER1: Error -12: Failed test CMAC/req/CMAC.req

Fixes: cd255ccf5764 ("examples/fips_validation: support AES parsing")

Signed-off-by: Marko Kovacevic <marko.kovacevic@intel.com>
---
 examples/fips_validation/main.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c
index e7559c633..40785decb 100644
--- a/examples/fips_validation/main.c
+++ b/examples/fips_validation/main.c
@@ -807,5 +807,5 @@ fips_run_test(void)
 		RTE_LOG(ERR, USER1, "Error %i: Init session\n",
 				ret);
-		return ret;
+		goto exit;
 	}
 
@@ -814,10 +814,11 @@ fips_run_test(void)
 		RTE_LOG(ERR, USER1, "Error %i: Prepare op\n",
 				ret);
-		return ret;
+		goto exit;
 	}
 
 	if (rte_cryptodev_enqueue_burst(env.dev_id, 0, &env.op, 1) < 1) {
 		RTE_LOG(ERR, USER1, "Error: Failed enqueue\n");
-		return ret;
+		ret = -1;
+		goto exit;
 	}
 
@@ -831,4 +832,5 @@ fips_run_test(void)
 	vec.status = env.op->status;
 
+exit:
 	rte_cryptodev_sym_session_clear(env.dev_id, env.sess);
 	rte_cryptodev_sym_session_free(env.sess);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:15.142556804 +0100
+++ 0028-examples-fips_validation-fix-CMAC-test.patch	2019-04-30 17:58:13.803139861 +0100
@@ -1 +1 @@
-From 083a277754f664d6f5d3af166f1f45ae0cb32cc3 Mon Sep 17 00:00:00 2001
+From 894eae3b831e752cfe4c2c2343f453a7291e10fa Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 083a277754f664d6f5d3af166f1f45ae0cb32cc3 ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -27 +28 @@
-index 5e3d5baa8..aef45055e 100644
+index e7559c633..40785decb 100644
@@ -30 +31 @@
-@@ -950,5 +950,5 @@ fips_run_test(void)
+@@ -807,5 +807,5 @@ fips_run_test(void)
@@ -37 +38 @@
-@@ -957,10 +957,11 @@ fips_run_test(void)
+@@ -814,10 +814,11 @@ fips_run_test(void)
@@ -51 +52 @@
-@@ -974,4 +975,5 @@ fips_run_test(void)
+@@ -831,4 +832,5 @@ fips_run_test(void)

[dpdk-stable] patch 'doc: add missing algorithms for AESNI-MB PMD' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 8cc53da812160674d4dbed5dbf35b79d957968f6 Mon Sep 17 00:00:00 2001
From: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Date: Wed, 10 Apr 2019 02:36:17 +0100
Subject: [PATCH] doc: add missing algorithms for AESNI-MB PMD

[ upstream commit 5ecb687a5698d2d8ec1f3b3b5a7a16bceca3e29c ]

The supported algorithm tables for AESNI MB PMD were
missing some supported algorithms.

Fixes: 0e9f8507afcb ("crypto/aesni_mb: support AES-GCM algorithm")
Fixes: e5eecd3dc838 ("crypto/aesni_mb: support AES-GMAC")
Fixes: 11fdbf1b7866 ("crypto/aesni_mb: support plain SHA")

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Acked-by: Fiona Trahe <fiona.trahe@intel.com>
---
 doc/guides/cryptodevs/features/aesni_mb.ini | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/doc/guides/cryptodevs/features/aesni_mb.ini b/doc/guides/cryptodevs/features/aesni_mb.ini
index f72957451..0956b80b0 100644
--- a/doc/guides/cryptodevs/features/aesni_mb.ini
+++ b/doc/guides/cryptodevs/features/aesni_mb.ini
@@ -33,11 +33,17 @@ DES DOCSIS BPI = Y
 [Auth]
 MD5 HMAC     = Y
+SHA1         = Y
 SHA1 HMAC    = Y
+SHA224       = Y
 SHA224 HMAC  = Y
+SHA256       = Y
 SHA256 HMAC  = Y
+SHA384       = Y
 SHA384 HMAC  = Y
+SHA512       = Y
 SHA512 HMAC  = Y
 AES XCBC MAC = Y
 AES CMAC (128)  = Y
+AES GMAC     = Y
 
 ;
@@ -46,2 +52,5 @@ AES CMAC (128)  = Y
 [AEAD]
 AES CCM (128) = Y
+AES GCM (128) = Y
+AES GCM (192) = Y
+AES GCM (256) = Y
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:15.186325968 +0100
+++ 0029-doc-add-missing-algorithms-for-AESNI-MB-PMD.patch	2019-04-30 17:58:13.804139841 +0100
@@ -1 +1 @@
-From 5ecb687a5698d2d8ec1f3b3b5a7a16bceca3e29c Mon Sep 17 00:00:00 2001
+From 8cc53da812160674d4dbed5dbf35b79d957968f6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5ecb687a5698d2d8ec1f3b3b5a7a16bceca3e29c ]
+
@@ -12 +13,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index 93a534f19..aa4df033d 100644
+index f72957451..0956b80b0 100644
@@ -24 +25 @@
-@@ -34,11 +34,17 @@ DES DOCSIS BPI = Y
+@@ -33,11 +33,17 @@ DES DOCSIS BPI = Y
@@ -42 +43 @@
-@@ -47,2 +53,5 @@ AES CMAC (128)  = Y
+@@ -46,2 +52,5 @@ AES CMAC (128)  = Y

[dpdk-stable] patch 'crypto/caam_jr: fix shared descriptor endianness' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 34c3b83dd68bc08d385e3a13a9bc26f2b9aef4ac Mon Sep 17 00:00:00 2001
From: Gagandeep Singh <g.singh@nxp.com>
Date: Mon, 8 Apr 2019 08:59:28 +0000
Subject: [PATCH] crypto/caam_jr: fix shared descriptor endianness

[ upstream commit d80dc4bb7c89321d8e03e5b7f278e30e99078bea ]

build a shared descriptor accordingly if core and
CAAM endianness is same or different

Fixes: 6ef6beca8844 ("crypto/caam_jr: add enqueue/dequeue operations")

Signed-off-by: Gagandeep Singh <g.singh@nxp.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 drivers/crypto/caam_jr/caam_jr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c
index 190053ee6..20452e3b7 100644
--- a/drivers/crypto/caam_jr/caam_jr.c
+++ b/drivers/crypto/caam_jr/caam_jr.c
@@ -312,5 +312,5 @@ caam_jr_prep_cdb(struct caam_jr_session *ses)
 	struct sec_cdb *cdb;
 	int err;
-#if RTE_BYTE_ORDER == RTE_BIG_ENDIAN
+#if CAAM_BYTE_ORDER == CORE_BYTE_ORDER
 	int swap = false;
 #else
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:15.231294458 +0100
+++ 0030-crypto-caam_jr-fix-shared-descriptor-endianness.patch	2019-04-30 17:58:13.806139800 +0100
@@ -1 +1 @@
-From d80dc4bb7c89321d8e03e5b7f278e30e99078bea Mon Sep 17 00:00:00 2001
+From 34c3b83dd68bc08d385e3a13a9bc26f2b9aef4ac Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit d80dc4bb7c89321d8e03e5b7f278e30e99078bea ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index f647b36cb..da9e9821e 100644
+index 190053ee6..20452e3b7 100644

[dpdk-stable] patch 'crypto/caam_jr: fix total length in auth only s/g' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 48b5635a668f12fa8774b0077e999e7c20a132b8 Mon Sep 17 00:00:00 2001
From: Gagandeep Singh <g.singh@nxp.com>
Date: Mon, 8 Apr 2019 08:59:30 +0000
Subject: [PATCH] crypto/caam_jr: fix total length in auth only s/g

[ upstream commit 3386ca38bdc4c835489ed088e2ea0843e90dc5b6 ]

CAAM return wrong digest value in AUTH only sg test case
because digest calculated on wrong length of data

Fixes: 71dd6b9d44e7 ("crypto/caam_jr: add scatter gather")

Signed-off-by: Gagandeep Singh <g.singh@nxp.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 drivers/crypto/caam_jr/caam_jr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/caam_jr/caam_jr.c b/drivers/crypto/caam_jr/caam_jr.c
index 20452e3b7..efc69b6eb 100644
--- a/drivers/crypto/caam_jr/caam_jr.c
+++ b/drivers/crypto/caam_jr/caam_jr.c
@@ -799,5 +799,5 @@ build_auth_only_sg(struct rte_crypto_op *op, struct caam_jr_session *ses)
 		length += ses->digest_length;
 	} else {
-		length -= ses->digest_length;
+		sg->len -= ses->digest_length;
 	}
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:15.275452653 +0100
+++ 0031-crypto-caam_jr-fix-total-length-in-auth-only-s-g.patch	2019-04-30 17:58:13.808139759 +0100
@@ -1 +1 @@
-From 3386ca38bdc4c835489ed088e2ea0843e90dc5b6 Mon Sep 17 00:00:00 2001
+From 48b5635a668f12fa8774b0077e999e7c20a132b8 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3386ca38bdc4c835489ed088e2ea0843e90dc5b6 ]
+
@@ -10 +11,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index da9e9821e..5028bd2a4 100644
+index 20452e3b7..efc69b6eb 100644
@@ -22 +23 @@
-@@ -800,5 +800,5 @@ build_auth_only_sg(struct rte_crypto_op *op, struct caam_jr_session *ses)
+@@ -799,5 +799,5 @@ build_auth_only_sg(struct rte_crypto_op *op, struct caam_jr_session *ses)

[dpdk-stable] patch 'crypto/caam_jr: fix memory leak and illegal access' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From d9131a02259eab3a61c0bc0ce159104735fb7670 Mon Sep 17 00:00:00 2001
From: Gagandeep Singh <g.singh@nxp.com>
Date: Tue, 9 Apr 2019 06:18:38 +0000
Subject: [PATCH] crypto/caam_jr: fix memory leak and illegal access

[ upstream commit c761bffe0bb35529e76ec7b13e21af39e87b6424 ]

Opendir() returns allocated storage which must be freed at the
end of function or in case any return on error. so freeing the
allocation using closedir in an error case.

Coverity issue: 323507
Coverity issue: 325880
Fixes: e7a45f3cc245 ("crypto/caam_jr: add UIO specific operations")

Signed-off-by: Gagandeep Singh <g.singh@nxp.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 drivers/crypto/caam_jr/caam_jr_uio.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/crypto/caam_jr/caam_jr_uio.c b/drivers/crypto/caam_jr/caam_jr_uio.c
index bf872a220..afd75c9a6 100644
--- a/drivers/crypto/caam_jr/caam_jr_uio.c
+++ b/drivers/crypto/caam_jr/caam_jr_uio.c
@@ -363,6 +363,6 @@ free_job_ring(uint32_t uio_fd)
 			(unsigned long)job_ring->map_size, strerror(errno));
 	} else
-		CAAM_JR_DEBUG("  JR UIO memory unmapped at %p",
-				job_ring->register_base_addr);
+		CAAM_JR_DEBUG("JR UIO memory is unmapped");
+
 	job_ring->register_base_addr = NULL;
 }
@@ -446,5 +446,9 @@ sec_configure(void)
 					dir->d_name, "name", uio_name);
 			CAAM_JR_INFO("sec device uio name: %s", uio_name);
-			SEC_ASSERT(ret == 0, -1, "file_read_first_line failed");
+			if (ret != 0) {
+				CAAM_JR_ERR("file_read_first_line failed\n");
+				closedir(d);
+				return -1;
+			}
 
 			if (file_name_match_extract(uio_name,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:15.322520169 +0100
+++ 0032-crypto-caam_jr-fix-memory-leak-and-illegal-access.patch	2019-04-30 17:58:13.809139739 +0100
@@ -1 +1 @@
-From c761bffe0bb35529e76ec7b13e21af39e87b6424 Mon Sep 17 00:00:00 2001
+From d9131a02259eab3a61c0bc0ce159104735fb7670 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c761bffe0bb35529e76ec7b13e21af39e87b6424 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org

[dpdk-stable] patch 'doc: fix missing asymmetric crypto table' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 8aec0f864f67a471ea2006b86f69739d9c0ac3bf Mon Sep 17 00:00:00 2001
From: Fiona Trahe <fiona.trahe@intel.com>
Date: Wed, 3 Apr 2019 11:38:20 +0100
Subject: [PATCH] doc: fix missing asymmetric crypto table

[ upstream commit 7df9d02e68c5e44e008cb6151021c04c428ed735 ]

Fixes: 11e5ba72cf67 ("doc: add crypto asymmetric feature list")

Signed-off-by: Fiona Trahe <fiona.trahe@intel.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 .gitignore                                   | 1 +
 doc/guides/conf.py                           | 5 +++++
 doc/guides/cryptodevs/features/aesni_gcm.ini | 5 +++++
 doc/guides/cryptodevs/features/aesni_mb.ini  | 5 +++++
 doc/guides/cryptodevs/features/armv8.ini     | 5 +++++
 doc/guides/cryptodevs/features/caam_jr.ini   | 5 +++++
 doc/guides/cryptodevs/features/ccp.ini       | 5 +++++
 doc/guides/cryptodevs/features/default.ini   | 9 +++++++++
 doc/guides/cryptodevs/features/dpaa2_sec.ini | 5 +++++
 doc/guides/cryptodevs/features/dpaa_sec.ini  | 5 +++++
 doc/guides/cryptodevs/features/kasumi.ini    | 5 +++++
 doc/guides/cryptodevs/features/mvsam.ini     | 5 +++++
 doc/guides/cryptodevs/features/null.ini      | 5 +++++
 doc/guides/cryptodevs/features/octeontx.ini  | 5 +++++
 doc/guides/cryptodevs/features/qat.ini       | 5 +++++
 doc/guides/cryptodevs/features/snow3g.ini    | 5 +++++
 doc/guides/cryptodevs/features/virtio.ini    | 5 +++++
 doc/guides/cryptodevs/features/zuc.ini       | 5 +++++
 doc/guides/cryptodevs/openssl.rst            | 8 ++++++++
 doc/guides/cryptodevs/overview.rst           | 7 +++++++
 20 files changed, 105 insertions(+)

diff --git a/.gitignore b/.gitignore
index 9105e26c5..3d6b35ed6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ doc/guides/cryptodevs/overview_cipher_table.txt
 doc/guides/cryptodevs/overview_auth_table.txt
 doc/guides/cryptodevs/overview_aead_table.txt
+doc/guides/cryptodevs/overview_asym_table.txt
 doc/guides/compressdevs/overview_feature_table.txt
 cscope.out.po
diff --git a/doc/guides/conf.py b/doc/guides/conf.py
index da99a3f84..a85f6c9d9 100644
--- a/doc/guides/conf.py
+++ b/doc/guides/conf.py
@@ -392,4 +392,9 @@ def setup(app):
                             'AEAD algorithms in crypto drivers',
                             'AEAD algorithm')
+    table_file = dirname(__file__) + '/cryptodevs/overview_asym_table.txt'
+    generate_overview_table(table_file, 5,
+                            'Asymmetric',
+                            'Asymmetric algorithms in crypto drivers',
+                            'Asymmetric algorithm')
     table_file = dirname(__file__) + '/compressdevs/overview_feature_table.txt'
     generate_overview_table(table_file, 1,
diff --git a/doc/guides/cryptodevs/features/aesni_gcm.ini b/doc/guides/cryptodevs/features/aesni_gcm.ini
index b9e9c9060..fdd3df690 100644
--- a/doc/guides/cryptodevs/features/aesni_gcm.ini
+++ b/doc/guides/cryptodevs/features/aesni_gcm.ini
@@ -31,2 +31,7 @@ AES GCM (128) = Y
 AES GCM (192) = Y
 AES GCM (256) = Y
+
+;
+; Supported Asymmetric algorithms of the 'aesni_gcm' crypto driver.
+;
+[Asymmetric]
\ No newline at end of file
diff --git a/doc/guides/cryptodevs/features/aesni_mb.ini b/doc/guides/cryptodevs/features/aesni_mb.ini
index 0956b80b0..9b4428ef0 100644
--- a/doc/guides/cryptodevs/features/aesni_mb.ini
+++ b/doc/guides/cryptodevs/features/aesni_mb.ini
@@ -55,2 +55,7 @@ AES GCM (128) = Y
 AES GCM (192) = Y
 AES GCM (256) = Y
+
+;
+; Supported Asymmetric algorithms of the 'aesni_mb' crypto driver.
+;
+[Asymmetric]
diff --git a/doc/guides/cryptodevs/features/armv8.ini b/doc/guides/cryptodevs/features/armv8.ini
index 1e1047714..e588f9021 100644
--- a/doc/guides/cryptodevs/features/armv8.ini
+++ b/doc/guides/cryptodevs/features/armv8.ini
@@ -27,2 +27,7 @@ SHA256 HMAC  = Y
 ;
 [AEAD]
+
+;
+; Supported Asymmetric algorithms of the 'armv8' crypto driver.
+;
+[Asymmetric]
diff --git a/doc/guides/cryptodevs/features/caam_jr.ini b/doc/guides/cryptodevs/features/caam_jr.ini
index 68f8d8195..c64bd35da 100644
--- a/doc/guides/cryptodevs/features/caam_jr.ini
+++ b/doc/guides/cryptodevs/features/caam_jr.ini
@@ -45,2 +45,7 @@ AES GCM (128) = Y
 AES GCM (192) = Y
 AES GCM (256) = Y
+
+;
+; Supported Asymmetric algorithms of the 'dpaa2_sec' crypto driver.
+;
+[Asymmetric]
\ No newline at end of file
diff --git a/doc/guides/cryptodevs/features/ccp.ini b/doc/guides/cryptodevs/features/ccp.ini
index 4722e135d..2970076b8 100644
--- a/doc/guides/cryptodevs/features/ccp.ini
+++ b/doc/guides/cryptodevs/features/ccp.ini
@@ -58,2 +58,7 @@ AES GCM (128) = Y
 AES GCM (192) = Y
 AES GCM (256) = Y
+
+;
+; Supported Asymmetric algorithms of the 'ccp' crypto driver.
+;
+[Asymmetric]
\ No newline at end of file
diff --git a/doc/guides/cryptodevs/features/default.ini b/doc/guides/cryptodevs/features/default.ini
index 810da0d7d..73ec389ba 100644
--- a/doc/guides/cryptodevs/features/default.ini
+++ b/doc/guides/cryptodevs/features/default.ini
@@ -96,2 +96,11 @@ AES CCM (128) =
 AES CCM (192) =
 AES CCM (256) =
+;
+; Supported Asymmetric algorithms of a default crypto driver.
+;
+[Asymmetric]
+RSA =
+DSA =
+Modular Exponentiation =
+Modular Inversion =
+Diffie-hellman =
\ No newline at end of file
diff --git a/doc/guides/cryptodevs/features/dpaa2_sec.ini b/doc/guides/cryptodevs/features/dpaa2_sec.ini
index 69700df40..9f4e4029c 100644
--- a/doc/guides/cryptodevs/features/dpaa2_sec.ini
+++ b/doc/guides/cryptodevs/features/dpaa2_sec.ini
@@ -45,2 +45,7 @@ AES GCM (128) = Y
 AES GCM (192) = Y
 AES GCM (256) = Y
+
+;
+; Supported Asymmetric algorithms of the 'dpaa2_sec' crypto driver.
+;
+[Asymmetric]
\ No newline at end of file
diff --git a/doc/guides/cryptodevs/features/dpaa_sec.ini b/doc/guides/cryptodevs/features/dpaa_sec.ini
index 937b621c0..954a70808 100644
--- a/doc/guides/cryptodevs/features/dpaa_sec.ini
+++ b/doc/guides/cryptodevs/features/dpaa_sec.ini
@@ -45,2 +45,7 @@ AES GCM (128) = Y
 AES GCM (192) = Y
 AES GCM (256) = Y
+
+;
+; Supported Asymmetric algorithms of the 'dpaa_sec' crypto driver.
+;
+[Asymmetric]
\ No newline at end of file
diff --git a/doc/guides/cryptodevs/features/kasumi.ini b/doc/guides/cryptodevs/features/kasumi.ini
index 0e138f5a6..f3d061009 100644
--- a/doc/guides/cryptodevs/features/kasumi.ini
+++ b/doc/guides/cryptodevs/features/kasumi.ini
@@ -23,2 +23,7 @@ KASUMI F9 = Y
 ;
 [AEAD]
+
+;
+; Supported Asymmetric algorithms of the 'kasumi' crypto driver.
+;
+[Asymmetric]
\ No newline at end of file
diff --git a/doc/guides/cryptodevs/features/mvsam.ini b/doc/guides/cryptodevs/features/mvsam.ini
index 0cc90a53d..829deff68 100644
--- a/doc/guides/cryptodevs/features/mvsam.ini
+++ b/doc/guides/cryptodevs/features/mvsam.ini
@@ -53,2 +53,7 @@ AES GCM (128) = Y
 AES GCM (192) = Y
 AES GCM (256) = Y
+
+;
+; Supported Asymmetric algorithms of the 'mvsam' crypto driver.
+;
+[Asymmetric]
\ No newline at end of file
diff --git a/doc/guides/cryptodevs/features/null.ini b/doc/guides/cryptodevs/features/null.ini
index ecf5779ac..a1c3e22a3 100644
--- a/doc/guides/cryptodevs/features/null.ini
+++ b/doc/guides/cryptodevs/features/null.ini
@@ -25,2 +25,7 @@ NULL = Y
 ;
 [AEAD]
+
+;
+; Supported Asymmetric algorithms of the 'null' crypto driver.
+;
+[Asymmetric]
\ No newline at end of file
diff --git a/doc/guides/cryptodevs/features/octeontx.ini b/doc/guides/cryptodevs/features/octeontx.ini
index 307ab88cc..1735b8f5a 100644
--- a/doc/guides/cryptodevs/features/octeontx.ini
+++ b/doc/guides/cryptodevs/features/octeontx.ini
@@ -61,2 +61,7 @@ AES GCM (128) = Y
 AES GCM (192) = Y
 AES GCM (256) = Y
+
+;
+; Supported Asymmetric algorithms of the 'octeontx' crypto driver.
+;
+[Asymmetric]
\ No newline at end of file
diff --git a/doc/guides/cryptodevs/features/qat.ini b/doc/guides/cryptodevs/features/qat.ini
index 4f15ee0e8..7955d8841 100644
--- a/doc/guides/cryptodevs/features/qat.ini
+++ b/doc/guides/cryptodevs/features/qat.ini
@@ -61,2 +61,7 @@ AES CCM (128) = Y
 AES CCM (192) = Y
 AES CCM (256) = Y
+
+;
+; Supported Asymmetric algorithms of the 'qat' crypto driver.
+;
+[Asymmetric]
diff --git a/doc/guides/cryptodevs/features/snow3g.ini b/doc/guides/cryptodevs/features/snow3g.ini
index 277136177..ec2daf6c6 100644
--- a/doc/guides/cryptodevs/features/snow3g.ini
+++ b/doc/guides/cryptodevs/features/snow3g.ini
@@ -23,2 +23,7 @@ SNOW3G UIA2 = Y
 ;
 [AEAD]
+
+;
+; Supported Asymmetric algorithms of the 'snow3g' crypto driver.
+;
+[Asymmetric]
\ No newline at end of file
diff --git a/doc/guides/cryptodevs/features/virtio.ini b/doc/guides/cryptodevs/features/virtio.ini
index 168fc174c..b59f1669b 100644
--- a/doc/guides/cryptodevs/features/virtio.ini
+++ b/doc/guides/cryptodevs/features/virtio.ini
@@ -25,2 +25,7 @@ SHA1 HMAC      = Y
 ;
 [AEAD]
+
+;
+; Supported Asymmetric algorithms of the 'virtio' crypto driver.
+;
+[Asymmetric]
diff --git a/doc/guides/cryptodevs/features/zuc.ini b/doc/guides/cryptodevs/features/zuc.ini
index 5bb02afd4..9b6a4287e 100644
--- a/doc/guides/cryptodevs/features/zuc.ini
+++ b/doc/guides/cryptodevs/features/zuc.ini
@@ -23,2 +23,7 @@ ZUC EIA3 = Y
 ;
 [AEAD]
+
+;
+; Supported Asymmetric algorithms of the 'zuc' crypto driver.
+;
+[Asymmetric]
diff --git a/doc/guides/cryptodevs/openssl.rst b/doc/guides/cryptodevs/openssl.rst
index bdc30f66f..2ac8090cc 100644
--- a/doc/guides/cryptodevs/openssl.rst
+++ b/doc/guides/cryptodevs/openssl.rst
@@ -47,4 +47,12 @@ Supported AEAD algorithms:
 * ``RTE_CRYPTO_AEAD_AES_CCM``
 
+Supported Asymmetric Crypto algorithms:
+
+* ``RTE_CRYPTO_ASYM_XFORM_RSA``
+* ``RTE_CRYPTO_ASYM_XFORM_DSA``
+* ``RTE_CRYPTO_ASYM_XFORM_DH``
+* ``RTE_CRYPTO_ASYM_XFORM_MODINV``
+* ``RTE_CRYPTO_ASYM_XFORM_MODEX``
+
 
 Installation
diff --git a/doc/guides/cryptodevs/overview.rst b/doc/guides/cryptodevs/overview.rst
index 607e758da..407f063de 100644
--- a/doc/guides/cryptodevs/overview.rst
+++ b/doc/guides/cryptodevs/overview.rst
@@ -59,2 +59,9 @@ Supported AEAD Algorithms
 
 .. include:: overview_aead_table.txt
+
+Supported Asymmetric Algorithms
+-------------------------------
+
+.. _table_crypto_pmd_asym_algos:
+
+.. include:: overview_asym_table.txt
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:15.365788051 +0100
+++ 0033-doc-fix-missing-asymmetric-crypto-table.patch	2019-04-30 17:58:13.813139657 +0100
@@ -1 +1 @@
-From 7df9d02e68c5e44e008cb6151021c04c428ed735 Mon Sep 17 00:00:00 2001
+From 8aec0f864f67a471ea2006b86f69739d9c0ac3bf Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7df9d02e68c5e44e008cb6151021c04c428ed735 ]
+
@@ -7 +8,0 @@
-Cc: stable@dpdk.org
@@ -35 +36 @@
-index b830c33f7..5eda2c31e 100644
+index 9105e26c5..3d6b35ed6 100644
@@ -38 +39 @@
-@@ -8,4 +8,5 @@ doc/guides/cryptodevs/overview_cipher_table.txt
+@@ -4,4 +4,5 @@ doc/guides/cryptodevs/overview_cipher_table.txt
@@ -43 +44 @@
- 
+ cscope.out.po
@@ -59 +60 @@
-index e32e83c20..86303c519 100644
+index b9e9c9060..fdd3df690 100644
@@ -62 +63 @@
-@@ -32,2 +32,7 @@ AES GCM (128) = Y
+@@ -31,2 +31,7 @@ AES GCM (128) = Y
@@ -72 +73 @@
-index aa4df033d..ee6a07460 100644
+index 0956b80b0..9b4428ef0 100644
@@ -75 +76 @@
-@@ -56,2 +56,7 @@ AES GCM (128) = Y
+@@ -55,2 +55,7 @@ AES GCM (128) = Y
@@ -122 +123 @@
-index 5f3ed3049..0e06261a5 100644
+index 810da0d7d..73ec389ba 100644
@@ -125 +126 @@
-@@ -98,2 +98,11 @@ AES CCM (128) =
+@@ -96,2 +96,11 @@ AES CCM (128) =
@@ -217 +218 @@
-index a7c727344..81325801e 100644
+index 4f15ee0e8..7955d8841 100644
@@ -220 +221 @@
-@@ -63,2 +63,7 @@ AES CCM (128) = Y
+@@ -61,2 +61,7 @@ AES CCM (128) = Y
@@ -266 +267 @@
-index 89aa5bac4..d7269870b 100644
+index bdc30f66f..2ac8090cc 100644
@@ -283 +284 @@
-index d7b7141a9..12f342b0f 100644
+index 607e758da..407f063de 100644
@@ -286 +287 @@
-@@ -65,2 +65,9 @@ Supported AEAD Algorithms
+@@ -59,2 +59,9 @@ Supported AEAD Algorithms

[dpdk-stable] patch 'app/crypto-perf: check range of socket id' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From f0d2cdc1df0abbb17d9585676261b2b1bf3f418f Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Mon, 8 Apr 2019 10:25:14 +0100
Subject: [PATCH] app/crypto-perf: check range of socket id

[ upstream commit 64c469b9e7d8faa85745adbfaf02d17cbb5b2bb4 ]

The socket_id is used as an array index so should be within the range
of zero to max numa nodes. Add a range check to ensure we don't get
excessive values.

Coverity issue: 336812
Coverity issue: 336829
Fixes: 2c59bd32b70d ("cryptodev: do not create session mempool internally")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Fan Zhang <roy.fan.zhang@intel.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 app/test-crypto-perf/main.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c
index 953e058c9..0aa0de8bd 100644
--- a/app/test-crypto-perf/main.c
+++ b/app/test-crypto-perf/main.c
@@ -130,4 +130,9 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs,
 		struct rte_cryptodev_info cdev_info;
 		uint8_t socket_id = rte_cryptodev_socket_id(cdev_id);
+		/* range check the socket_id - negative values become big
+		 * positive ones due to use of unsigned value
+		 */
+		if (socket_id >= RTE_MAX_NUMA_NODES)
+			socket_id = 0;
 
 		rte_cryptodev_info_get(cdev_id, &cdev_info);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:15.413061839 +0100
+++ 0034-app-crypto-perf-check-range-of-socket-id.patch	2019-04-30 17:58:13.814139636 +0100
@@ -1 +1 @@
-From 64c469b9e7d8faa85745adbfaf02d17cbb5b2bb4 Mon Sep 17 00:00:00 2001
+From f0d2cdc1df0abbb17d9585676261b2b1bf3f418f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 64c469b9e7d8faa85745adbfaf02d17cbb5b2bb4 ]
+
@@ -13 +14,0 @@
-CC: stable@dpdk.org
@@ -23 +24 @@
-index 175c639fb..4247f6add 100644
+index 953e058c9..0aa0de8bd 100644
@@ -26 +27 @@
-@@ -184,4 +184,9 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs)
+@@ -130,4 +130,9 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs,

[dpdk-stable] patch 'crypto/dpaa: fix session destroy' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 2fa3f31e26a3e3fe2fff2316bd6e7566d8049d34 Mon Sep 17 00:00:00 2001
From: Akhil Goyal <akhil.goyal@nxp.com>
Date: Wed, 17 Apr 2019 15:58:14 +0530
Subject: [PATCH] crypto/dpaa: fix session destroy

[ upstream commit 261fb941858cfe3df7960fa43976436d71af13a2 ]

Coverity issue: 336798
Fixes: 1f14d500bce1 ("crypto/dpaa_sec: support IPsec protocol offload")
Fixes: 0a23d4b6f4c2 ("crypto/dpaa2_sec: support protocol offload IPsec")

Signed-off-by: Akhil Goyal <akhil.goyal@nxp.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
---
 drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 2 +-
 drivers/crypto/dpaa_sec/dpaa_sec.c          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index ec3111b29..a7973cc04 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -2865,5 +2865,5 @@ dpaa2_sec_security_session_destroy(void *dev __rte_unused,
 		rte_free(s->cipher_key.data);
 		rte_free(s->auth_key.data);
-		memset(sess, 0, sizeof(dpaa2_sec_session));
+		memset(s, 0, sizeof(dpaa2_sec_session));
 		set_sec_session_private_data(sess, NULL);
 		rte_mempool_put(sess_mp, sess_priv);
diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c
index 8958fd06a..10201c58c 100644
--- a/drivers/crypto/dpaa_sec/dpaa_sec.c
+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c
@@ -2167,5 +2167,5 @@ dpaa_sec_security_session_destroy(void *dev __rte_unused,
 		rte_free(s->cipher_key.data);
 		rte_free(s->auth_key.data);
-		memset(sess, 0, sizeof(dpaa_sec_session));
+		memset(s, 0, sizeof(dpaa_sec_session));
 		set_sec_session_private_data(sess, NULL);
 		rte_mempool_put(sess_mp, sess_priv);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:15.458098754 +0100
+++ 0035-crypto-dpaa-fix-session-destroy.patch	2019-04-30 17:58:13.820139513 +0100
@@ -1 +1 @@
-From 261fb941858cfe3df7960fa43976436d71af13a2 Mon Sep 17 00:00:00 2001
+From 2fa3f31e26a3e3fe2fff2316bd6e7566d8049d34 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 261fb941858cfe3df7960fa43976436d71af13a2 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -19 +20 @@
-index 5b72b9ee4..0d273bb62 100644
+index ec3111b29..a7973cc04 100644
@@ -22 +23 @@
-@@ -2837,5 +2837,5 @@ dpaa2_sec_security_session_destroy(void *dev __rte_unused,
+@@ -2865,5 +2865,5 @@ dpaa2_sec_security_session_destroy(void *dev __rte_unused,
@@ -30 +31 @@
-index 8305f19a3..d9a7cd8a4 100644
+index 8958fd06a..10201c58c 100644
@@ -33 +34 @@
-@@ -2454,5 +2454,5 @@ dpaa_sec_security_session_destroy(void *dev __rte_unused,
+@@ -2167,5 +2167,5 @@ dpaa_sec_security_session_destroy(void *dev __rte_unused,

[dpdk-stable] patch 'kni: fix build with Linux 5.1' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From a8e1f16cf7b58229db97eec66d5f668a1c389d8e Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Mon, 8 Apr 2019 15:22:26 +0100
Subject: [PATCH] kni: fix build with Linux 5.1

[ upstream commit db9178c24c1643b5ef58f2a9ff87c3eef8e0e1e4 ]

Build error seen with Linux kernel 5.1 and
when CONFIG_RTE_KNI_KMOD_ETHTOOL is enabled.

Build error:
kernel/linux/kni/igb_main.c:2352:18:
  error: initialization of ... from incompatible pointer type ...
  [-Werror=incompatible-pointer-types]
    .ndo_fdb_add  = igb_ndo_fdb_add,
                      ^~~~~~~~~~~~~~~

ndo_fdb_add() is changed in Linux kernel version 5.1 and now requires
a new parameter, 'struct netlink_ext_ack *extack':
Linux Commit 87b0984ebfab ("net: Add extack argument to ndo_fdb_add()")

ndo_fdb_add() parameter updated with compile time Linux kernel version
check.

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Tested-by: Bruce Richardson <bruce.richardson@intel.com>
Reviewed-by: Rami Rosen <ramirose@gmail.com>
---
 kernel/linux/kni/ethtool/igb/igb_main.c | 6 ++++++
 kernel/linux/kni/ethtool/igb/kcompat.h  | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/kernel/linux/kni/ethtool/igb/igb_main.c b/kernel/linux/kni/ethtool/igb/igb_main.c
index 0b4faeae5..cda2b063d 100644
--- a/kernel/linux/kni/ethtool/igb/igb_main.c
+++ b/kernel/linux/kni/ethtool/igb/igb_main.c
@@ -2113,5 +2113,11 @@ static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
 			   u16 vid,
 #endif
+#ifdef HAVE_NDO_FDB_ADD_EXTACK
+			   u16 flags,
+			   struct netlink_ext_ack *extack)
+#else
 			   u16 flags)
+#endif
+
 #else
 static int igb_ndo_fdb_add(struct ndmsg *ndm,
diff --git a/kernel/linux/kni/ethtool/igb/kcompat.h b/kernel/linux/kni/ethtool/igb/kcompat.h
index 11b15f3a9..649a69c81 100644
--- a/kernel/linux/kni/ethtool/igb/kcompat.h
+++ b/kernel/linux/kni/ethtool/igb/kcompat.h
@@ -3946,4 +3946,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
 #endif /* >= 5.0.0 */
 
+#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0) )
+#define HAVE_NDO_FDB_ADD_EXTACK
+#endif /* >= 5.1.0 */
+
 #if defined(timer_setup) && defined(from_timer)
 #define HAVE_TIMER_SETUP
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:15.507438798 +0100
+++ 0036-kni-fix-build-with-Linux-5.1.patch	2019-04-30 17:58:13.831139288 +0100
@@ -1 +1 @@
-From db9178c24c1643b5ef58f2a9ff87c3eef8e0e1e4 Mon Sep 17 00:00:00 2001
+From a8e1f16cf7b58229db97eec66d5f668a1c389d8e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit db9178c24c1643b5ef58f2a9ff87c3eef8e0e1e4 ]
+
@@ -22,2 +23,0 @@
-
-Cc: stable@dpdk.org

[dpdk-stable] patch 'kni: fix type for MAC address' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 3c3f7838071bcaeb23e655513662bbc0d4a01a49 Mon Sep 17 00:00:00 2001
From: Jie Pan <panjie5@jd.com>
Date: Wed, 10 Apr 2019 14:20:55 +0800
Subject: [PATCH] kni: fix type for MAC address

[ upstream commit c629829f026dd0215db30a34fadfef3830932dd6 ]

The type for MAC address should be unsigned.

Fixes: 1cfe212ed17a ("kni: support MAC address change")

Signed-off-by: Jie Pan <panjie5@jd.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
Reviewed-by: Rami Rosen <ramirose@gmail.com>
---
 kernel/linux/kni/kni_misc.c                                   | 2 +-
 lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h | 2 +-
 lib/librte_kni/rte_kni.h                                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c
index 522ae23b9..b74e8a3a6 100644
--- a/kernel/linux/kni/kni_misc.c
+++ b/kernel/linux/kni/kni_misc.c
@@ -448,5 +448,5 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,
 	else {
 		/* if user has provided a valid mac address */
-		if (is_valid_ether_addr((unsigned char *)(dev_info.mac_addr)))
+		if (is_valid_ether_addr(dev_info.mac_addr))
 			memcpy(net_dev->dev_addr, dev_info.mac_addr, ETH_ALEN);
 		else
diff --git a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
index 5afa08713..5db5a1333 100644
--- a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
+++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
@@ -128,5 +128,5 @@ struct rte_kni_device_info {
 	unsigned mbuf_size;
 	unsigned int mtu;
-	char mac_addr[6];
+	uint8_t mac_addr[6];
 };
 
diff --git a/lib/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h
index 02ca43b4b..d44496c71 100644
--- a/lib/librte_kni/rte_kni.h
+++ b/lib/librte_kni/rte_kni.h
@@ -69,5 +69,5 @@ struct rte_kni_conf {
 	__extension__
 	uint8_t force_bind : 1; /* Flag to bind kernel thread */
-	char mac_addr[ETHER_ADDR_LEN]; /* MAC address assigned to KNI */
+	uint8_t mac_addr[ETHER_ADDR_LEN]; /* MAC address assigned to KNI */
 	uint16_t mtu;
 };
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:15.565658897 +0100
+++ 0037-kni-fix-type-for-MAC-address.patch	2019-04-30 17:58:13.833139247 +0100
@@ -1 +1 @@
-From c629829f026dd0215db30a34fadfef3830932dd6 Mon Sep 17 00:00:00 2001
+From 3c3f7838071bcaeb23e655513662bbc0d4a01a49 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c629829f026dd0215db30a34fadfef3830932dd6 ]
+
@@ -9 +10,0 @@
-Cc: stable@dpdk.org
@@ -15,3 +16,3 @@
- kernel/linux/kni/kni_misc.c                       | 2 +-
- lib/librte_eal/linux/eal/include/rte_kni_common.h | 2 +-
- lib/librte_kni/rte_kni.h                          | 2 +-
+ kernel/linux/kni/kni_misc.c                                   | 2 +-
+ lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h | 2 +-
+ lib/librte_kni/rte_kni.h                                      | 2 +-
@@ -21 +22 @@
-index 31845e10f..b6f474de4 100644
+index 522ae23b9..b74e8a3a6 100644
@@ -31 +32 @@
-diff --git a/lib/librte_eal/linux/eal/include/rte_kni_common.h b/lib/librte_eal/linux/eal/include/rte_kni_common.h
+diff --git a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
@@ -33,2 +34,2 @@
---- a/lib/librte_eal/linux/eal/include/rte_kni_common.h
-+++ b/lib/librte_eal/linux/eal/include/rte_kni_common.h
+--- a/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
++++ b/lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h
@@ -43 +44 @@
-index 9a9a7d754..c93d3a985 100644
+index 02ca43b4b..d44496c71 100644

[dpdk-stable] patch 'mbuf: update Tx VLAN and QinQ flags documentation' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/07/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches can be viewed on a temporary branch at:
	https://github.com/kevintraynor/dpdk-stable-queue.git

Thanks.

Kevin Traynor

---
From 00ad10cda3ca5dc806256da82bf7afbd354d4052 Mon Sep 17 00:00:00 2001
From: Ferruh Yigit <ferruh.yigit@intel.com>
Date: Tue, 2 Apr 2019 18:09:46 +0100
Subject: [PATCH] mbuf: update Tx VLAN and QinQ flags documentation

[ upstream commit 00cc9701e4d3390f80d5f7e8109587fe342718a9 ]

Currently PKT_TX_VLAN and PKT_TX_QINQ mbuf flags are documented as
they are to say packet contains VLAN or QINQ information.

Updating the definition as they are requests from application to
driver to insert VLAN or double VLAN tags into packet.

Fixes: dc6c911c9993 ("mbuf: use reserved space for double vlan")
Fixes: af75078fece3 ("first public release")

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
---
 lib/librte_mbuf/rte_mbuf.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/librte_mbuf/rte_mbuf.h b/lib/librte_mbuf/rte_mbuf.h
index 795015c81..c3bf2fe6d 100644
--- a/lib/librte_mbuf/rte_mbuf.h
+++ b/lib/librte_mbuf/rte_mbuf.h
@@ -280,7 +280,9 @@ extern "C" {
 
 /**
- * Second VLAN insertion (QinQ) flag.
+ * Double VLAN insertion (QinQ) request to driver, driver may offload the
+ * insertion based on device capability.
+ * mbuf 'vlan_tci' & 'vlan_tci_outer' must be valid when this flag is set.
  */
-#define PKT_TX_QINQ        (1ULL << 49)   /**< TX packet with double VLAN inserted. */
+#define PKT_TX_QINQ        (1ULL << 49)
 /* this old name is deprecated */
 #define PKT_TX_QINQ_PKT    PKT_TX_QINQ
@@ -338,5 +340,7 @@ extern "C" {
 
 /**
- * TX packet is a 802.1q VLAN packet.
+ * VLAN tag insertion request to driver, driver may offload the insertion
+ * based on the device capability.
+ * mbuf 'vlan_tci' field must be valid when this flag is set.
  */
 #define PKT_TX_VLAN          (1ULL << 57)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-04-30 17:58:15.608608074 +0100
+++ 0038-mbuf-update-Tx-VLAN-and-QinQ-flags-documentation.patch	2019-04-30 17:58:13.835139206 +0100
@@ -1 +1 @@
-From 00cc9701e4d3390f80d5f7e8109587fe342718a9 Mon Sep 17 00:00:00 2001
+From 00ad10cda3ca5dc806256da82bf7afbd354d4052 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 00cc9701e4d3390f80d5f7e8109587fe342718a9 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index f7886dcb3..a6c4a5e18 100644
+index 795015c81..c3bf2fe6d 100644
@@ -26 +27 @@
-@@ -281,7 +281,9 @@ extern "C" {
+@@ -280,7 +280,9 @@ extern "C" {
@@ -38 +39 @@
-@@ -339,5 +341,7 @@ extern "C" {
+@@ -338,5 +340,7 @@ extern "C" {

Re: [dpdk-stable] patch 'devtools: accept experimental symbol promotion' has been queued to LTS release 18.11.2

[David Marchand]

Hello Kevin,

On Tue, Apr 30, 2019 at 7:02 PM Kevin Traynor <ktraynor@redhat.com> wrote:

> FYI, your patch has been queued to LTS release 18.11.2
>
> Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
> It will be pushed if I get no objections before 05/07/19. So please
> shout if anyone has objections.
>

Please postpone this patch, I discussed issues with Thomas and I am working
on a fix.


-- 
David Marchand

Re: [dpdk-stable] patch 'devtools: accept experimental symbol promotion' has been queued to LTS release 18.11.2

[Kevin Traynor]

On 02/05/2019 08:25, David Marchand wrote:
> Hello Kevin,
> 
> On Tue, Apr 30, 2019 at 7:02 PM Kevin Traynor <ktraynor@redhat.com> wrote:
> 
>> FYI, your patch has been queued to LTS release 18.11.2
>>
>> Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
>> It will be pushed if I get no objections before 05/07/19. So please
>> shout if anyone has objections.
>>
> 
> Please postpone this patch, I discussed issues with Thomas and I am working
> on a fix.
> 
> 

Thanks David - removed it from the queue.

[dpdk-stable] patch 'devtools: accept experimental symbol promotion' has been queued to LTS release 18.11.2

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.2

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/20/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. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/81673cbe5baf20c81890155a68181d4fc6915acd

Thanks.

Kevin Traynor

---
From 81673cbe5baf20c81890155a68181d4fc6915acd Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand@redhat.com>
Date: Fri, 5 Apr 2019 10:17:47 +0200
Subject: [PATCH] devtools: accept experimental symbol promotion

[ upstream commit 3630757803ab2f914ab36bb0285b662b3cff50db ]

Currently, when symbols get promoted from the EXPERIMENTAL section to a
stable ABI section, the script complains they should go to the
EXPERIMENTAL section.

Example:
ERROR: symbol rte_devargs_add is added in the DPDK_19.05 section, but is
expected to be added in the EXPERIMENTAL section of the version map

This is legit.
Moving from a stable ABI to another is also allowed, but must have gone
through the proper process.

Fixes: 4bec48184e33 ("devtools: add checks for ABI symbol addition")

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
---
 devtools/check-symbol-change.sh | 43 +++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/devtools/check-symbol-change.sh b/devtools/check-symbol-change.sh
index 9fe8a5229..cd59b8b5d 100755
--- a/devtools/check-symbol-change.sh
+++ b/devtools/check-symbol-change.sh
@@ -106,24 +106,35 @@ check_for_rule_violations()
 			fi
 
-			if [ "$secname" != "EXPERIMENTAL" ]
+			oldsecname=$(sed -n \
+			"s#$mname $symname \(.*\) del#\1#p" "$mapdb")
+
+			# A symbol can not enter a non experimental
+			# section directly
+			if [ $? -ne 0 ] && [ "$secname" != 'EXPERIMENTAL' ]
 			then
-				# Symbols that are getting added in a section
-				# other than the experimental section
-				# to be moving from an already supported
-				# section or its a violation
-				grep -q \
-				"$mname $symname [^EXPERIMENTAL] del" "$mapdb"
-				if [ $? -ne 0 ]
-				then
-					echo -n "ERROR: symbol $symname "
-					echo -n "is added in a section "
-					echo -n "other than the EXPERIMENTAL "
-					echo "section of the version map"
-					ret=1
-				fi
+				echo -n "ERROR: symbol $symname "
+				echo -n "is added in the $secname "
+				echo -n "section, but is expected to "
+				echo -n "be added in the EXPERIMENTAL "
+				echo "section of the version map"
+				ret=1
+				continue
+			fi
+
+			# This symbol is moving between two sections (the
+			# original section is not experimental).
+			# This can be legit, just warn.
+			if [ "$oldsecname" != 'EXPERIMENTAL' ]
+			then
+				echo -n "INFO: symbol $symname is being "
+				echo -n "moved from $oldsecname to $secname. "
+				echo -n "Ensure that it has gone through the "
+				echo "deprecation process"
+				continue
 			fi
 		else
 
-			if [ "$secname" != "EXPERIMENTAL" ]
+			if ! grep -q "$mname $symname .* add" "$mapdb" && \
+			   [ "$secname" != "EXPERIMENTAL" ]
 			then
 				# Just inform users that non-experimenal
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-05-14 15:39:08.075559129 +0100
+++ 0016-devtools-accept-experimental-symbol-promotion.patch	2019-05-14 15:39:07.313558811 +0100
@@ -1 +1 @@
-From 3630757803ab2f914ab36bb0285b662b3cff50db Mon Sep 17 00:00:00 2001
+From 81673cbe5baf20c81890155a68181d4fc6915acd Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3630757803ab2f914ab36bb0285b662b3cff50db ]
+
@@ -19 +20,0 @@
-Cc: stable@dpdk.org
@@ -24,2 +25,2 @@
- devtools/check-symbol-change.sh | 44 ++++++++++++++++++++-------------
- 1 file changed, 27 insertions(+), 17 deletions(-)
+ devtools/check-symbol-change.sh | 43 +++++++++++++++++++++------------
+ 1 file changed, 27 insertions(+), 16 deletions(-)
@@ -28 +29 @@
-index 020da7ed0..40eb95322 100755
+index 9fe8a5229..cd59b8b5d 100755
@@ -31 +32 @@
-@@ -106,25 +106,35 @@ check_for_rule_violations()
+@@ -106,24 +106,35 @@ check_for_rule_violations()
@@ -51,3 +52,2 @@
--					echo -n "is added in the $secname "
--					echo -n "section, but is expected to "
--					echo -n "be added in the EXPERIMENTAL "
+-					echo -n "is added in a section "
+-					echo -n "other than the EXPERIMENTAL "