[dpdk-stable] patch 'bus/pci: fix devargs on probing again' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.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 05/21/20. 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.

Luca Boccassi

---
>From 39adba3b5526554d843ea5935d63fdc7913d459a Mon Sep 17 00:00:00 2001
From: Somnath Kotur <somnath.kotur at broadcom.com>
Date: Fri, 14 Feb 2020 12:13:53 +0530
Subject: [PATCH] bus/pci: fix devargs on probing again

[ upstream commit fc67ae91ebae7c48fc27a1d24e0843c50c192459 ]

As per the comments in this code section, since there is a matching device,
it is now its responsibility to manage the devargs we've just inserted.
But the matching device ptr's devargs is still uninitialized or not pointing
to the newest dev_args that were passed as a parameter to local_dev_probe().
This is needed particularly in the case when *probe is called again* on an
already probed device as part of adding a representor port to OVS-DPDK.

Fixes: 7e8b26650146 ("eal: fix hotplug add / remove")

Signed-off-by: Somnath Kotur <somnath.kotur at broadcom.com>
Acked-by: Gaetan Rivet <grive at u256.net>
---
 drivers/bus/pci/linux/pci.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/bus/pci/linux/pci.c b/drivers/bus/pci/linux/pci.c
index 740a2cdad4..71b0a3053d 100644
--- a/drivers/bus/pci/linux/pci.c
+++ b/drivers/bus/pci/linux/pci.c
@@ -377,6 +377,11 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)
 						 */
 						RTE_LOG(ERR, EAL, "Unexpected device scan at %s!\n",
 							filename);
+					else if (dev2->device.devargs !=
+						 dev->device.devargs) {
+						rte_devargs_remove(dev2->device.devargs);
+						pci_name_set(dev2);
+					}
 				}
 				free(dev);
 			}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 13:56:21.164088256 +0100
+++ 0057-bus-pci-fix-devargs-on-probing-again.patch	2020-05-19 13:56:18.287503043 +0100
@@ -1,8 +1,10 @@
-From fc67ae91ebae7c48fc27a1d24e0843c50c192459 Mon Sep 17 00:00:00 2001
+From 39adba3b5526554d843ea5935d63fdc7913d459a Mon Sep 17 00:00:00 2001
 From: Somnath Kotur <somnath.kotur at broadcom.com>
 Date: Fri, 14 Feb 2020 12:13:53 +0530
 Subject: [PATCH] bus/pci: fix devargs on probing again
 
+[ upstream commit fc67ae91ebae7c48fc27a1d24e0843c50c192459 ]
+
 As per the comments in this code section, since there is a matching device,
 it is now its responsibility to manage the devargs we've just inserted.
 But the matching device ptr's devargs is still uninitialized or not pointing
@@ -11,7 +13,6 @@
 already probed device as part of adding a representor port to OVS-DPDK.
 
 Fixes: 7e8b26650146 ("eal: fix hotplug add / remove")
-Cc: stable at dpdk.org
 
 Signed-off-by: Somnath Kotur <somnath.kotur at broadcom.com>
 Acked-by: Gaetan Rivet <grive at u256.net>