[dpdk-stable] patch 'net/ifc: store only registered device instance' has been queued to LTS release 18.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.1

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

Thanks.

Kevin Traynor

---
>From b0b814782f0fd9092b6b3b575c2f555b76c9f037 Mon Sep 17 00:00:00 2001
From: Xiao Wang <xiao.w.wang at intel.com>
Date: Tue, 18 Dec 2018 16:02:02 +0800
Subject: [PATCH] net/ifc: store only registered device instance

[ upstream commit 7b47ea59f2f6da6cbeb84f203eaac0a4812036cd ]

If driver fails to register ifc VF device into vhost lib, then this
device should not be stored.

Fixes: a3f8150eac6d ("net/ifcvf: add ifcvf vDPA driver")

Signed-off-by: Xiao Wang <xiao.w.wang at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/ifc/ifcvf_vdpa.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifc/ifcvf_vdpa.c
index 97a57f182..698d14f88 100644
--- a/drivers/net/ifc/ifcvf_vdpa.c
+++ b/drivers/net/ifc/ifcvf_vdpa.c
@@ -774,8 +774,4 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 	list->internal = internal;
 
-	pthread_mutex_lock(&internal_list_lock);
-	TAILQ_INSERT_TAIL(&internal_list, list, next);
-	pthread_mutex_unlock(&internal_list_lock);
-
 	internal->did = rte_vdpa_register_device(&internal->dev_addr,
 				&ifcvf_ops);
@@ -783,4 +779,8 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 		goto error;
 
+	pthread_mutex_lock(&internal_list_lock);
+	TAILQ_INSERT_TAIL(&internal_list, list, next);
+	pthread_mutex_unlock(&internal_list_lock);
+
 	rte_atomic32_set(&internal->started, 1);
 	update_datapath(internal);
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-04 13:23:08.638702012 +0000
+++ 0049-net-ifc-store-only-registered-device-instance.patch	2019-01-04 13:23:07.000000000 +0000
@@ -1,13 +1,14 @@
-From 7b47ea59f2f6da6cbeb84f203eaac0a4812036cd Mon Sep 17 00:00:00 2001
+From b0b814782f0fd9092b6b3b575c2f555b76c9f037 Mon Sep 17 00:00:00 2001
 From: Xiao Wang <xiao.w.wang at intel.com>
 Date: Tue, 18 Dec 2018 16:02:02 +0800
 Subject: [PATCH] net/ifc: store only registered device instance
 
+[ upstream commit 7b47ea59f2f6da6cbeb84f203eaac0a4812036cd ]
+
 If driver fails to register ifc VF device into vhost lib, then this
 device should not be stored.
 
 Fixes: a3f8150eac6d ("net/ifcvf: add ifcvf vDPA driver")
-Cc: stable at dpdk.org
 
 Signed-off-by: Xiao Wang <xiao.w.wang at intel.com>
 Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
@@ -16,10 +17,10 @@
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifc/ifcvf_vdpa.c
-index aacd5f9bf..6fcd50b73 100644
+index 97a57f182..698d14f88 100644
 --- a/drivers/net/ifc/ifcvf_vdpa.c
 +++ b/drivers/net/ifc/ifcvf_vdpa.c
-@@ -782,8 +782,4 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+@@ -774,8 +774,4 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
  	list->internal = internal;
  
 -	pthread_mutex_lock(&internal_list_lock);
@@ -28,8 +29,8 @@
 -
  	internal->did = rte_vdpa_register_device(&internal->dev_addr,
  				&ifcvf_ops);
-@@ -793,4 +789,8 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
- 	}
+@@ -783,4 +779,8 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
+ 		goto error;
  
 +	pthread_mutex_lock(&internal_list_lock);
 +	TAILQ_INSERT_TAIL(&internal_list, list, next);