[dpdk-stable] patch 'net/i40e: fix crash when TxQ/RxQ set to 0 in VF' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/03/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/9a920d057ba69f4f44569ab88e3c042091d995f7

Thanks.

Kevin Traynor

---
>From 9a920d057ba69f4f44569ab88e3c042091d995f7 Mon Sep 17 00:00:00 2001
From: Andy Pei <andy.pei at intel.com>
Date: Thu, 4 Jul 2019 09:38:39 +0800
Subject: [PATCH] net/i40e: fix crash when TxQ/RxQ set to 0 in VF

[ upstream commit 343b8e4adabcfabe282b3fdb419e98f6f9cb0b35 ]

Testpmd would stuck and result in core dump when user specifies an
invalid VF queue number, for example when setting txq or rxq to 0.
When txq or rxq is set to 0, pointer of pointer rxq or txq in
function i40evf_configure_vsi_queues is NULL. The usage of txq[i]
or rxq[0] is valid. This patch fixes this issue.

Fixes: d6b19729093e ("i40evf: support configurable crc stripping")

Signed-off-by: Andy Pei <andy.pei at intel.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/i40e/i40e_ethdev_vf.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index 551f6fa61..de29f04cb 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -551,5 +551,5 @@ i40evf_fill_virtchnl_vsi_txq_info(struct virtchnl_txq_info *txq_info,
 	txq_info->vsi_id = vsi_id;
 	txq_info->queue_id = queue_id;
-	if (queue_id < nb_txq) {
+	if (queue_id < nb_txq && txq) {
 		txq_info->ring_len = txq->nb_tx_desc;
 		txq_info->dma_ring_addr = txq->tx_ring_phys_addr;
@@ -568,5 +568,5 @@ i40evf_fill_virtchnl_vsi_rxq_info(struct virtchnl_rxq_info *rxq_info,
 	rxq_info->queue_id = queue_id;
 	rxq_info->max_pkt_size = max_pkt_size;
-	if (queue_id < nb_rxq) {
+	if (queue_id < nb_rxq && rxq) {
 		rxq_info->ring_len = rxq->nb_rx_desc;
 		rxq_info->dma_ring_addr = rxq->rx_ring_phys_addr;
@@ -601,8 +601,9 @@ i40evf_configure_vsi_queues(struct rte_eth_dev *dev)
 	for (i = 0, vc_qpi = vc_vqci->qpair; i < nb_qp; i++, vc_qpi++) {
 		i40evf_fill_virtchnl_vsi_txq_info(&vc_qpi->txq,
-			vc_vqci->vsi_id, i, dev->data->nb_tx_queues, txq[i]);
+			vc_vqci->vsi_id, i, dev->data->nb_tx_queues,
+			txq ? txq[i] : NULL);
 		i40evf_fill_virtchnl_vsi_rxq_info(&vc_qpi->rxq,
 			vc_vqci->vsi_id, i, dev->data->nb_rx_queues,
-					vf->max_pkt_len, rxq[i]);
+			vf->max_pkt_len, rxq ? rxq[i] : NULL);
 	}
 	memset(&args, 0, sizeof(args));
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.444315365 +0100
+++ 0010-net-i40e-fix-crash-when-TxQ-RxQ-set-to-0-in-VF.patch	2019-08-27 09:40:10.858145893 +0100
@@ -1 +1 @@
-From 343b8e4adabcfabe282b3fdb419e98f6f9cb0b35 Mon Sep 17 00:00:00 2001
+From 9a920d057ba69f4f44569ab88e3c042091d995f7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 343b8e4adabcfabe282b3fdb419e98f6f9cb0b35 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index d922a8479..5be32b069 100644
+index 551f6fa61..de29f04cb 100644
@@ -25 +26 @@
-@@ -574,5 +574,5 @@ i40evf_fill_virtchnl_vsi_txq_info(struct virtchnl_txq_info *txq_info,
+@@ -551,5 +551,5 @@ i40evf_fill_virtchnl_vsi_txq_info(struct virtchnl_txq_info *txq_info,
@@ -32 +33 @@
-@@ -591,5 +591,5 @@ i40evf_fill_virtchnl_vsi_rxq_info(struct virtchnl_rxq_info *rxq_info,
+@@ -568,5 +568,5 @@ i40evf_fill_virtchnl_vsi_rxq_info(struct virtchnl_rxq_info *rxq_info,
@@ -39 +40 @@
-@@ -624,8 +624,9 @@ i40evf_configure_vsi_queues(struct rte_eth_dev *dev)
+@@ -601,8 +601,9 @@ i40evf_configure_vsi_queues(struct rte_eth_dev *dev)