From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id ECDE81B489 for ; Fri, 4 Jan 2019 14:27:55 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 60CFD394D40; Fri, 4 Jan 2019 13:27:55 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-13.ams2.redhat.com [10.36.117.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id D6C695C1A1; Fri, 4 Jan 2019 13:27:52 +0000 (UTC) From: Kevin Traynor To: Xiao Wang Cc: Maxime Coquelin , dpdk stable Date: Fri, 4 Jan 2019 13:24:31 +0000 Message-Id: <20190104132455.15170-49-ktraynor@redhat.com> In-Reply-To: <20190104132455.15170-1-ktraynor@redhat.com> References: <20190104132455.15170-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 04 Jan 2019 13:27:55 +0000 (UTC) Subject: [dpdk-stable] patch 'net/ifc: store only registered device instance' has been queued to LTS release 18.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jan 2019 13:27:56 -0000 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 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 Reviewed-by: Maxime Coquelin --- 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 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@dpdk.org Signed-off-by: Xiao Wang Reviewed-by: Maxime Coquelin @@ -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);