[dpdk-stable] patch 'net/hns3: check setting VF PCI bus return value' has been queued to stable release 19.11.6

luca.boccassi at gmail.com luca.boccassi at gmail.com
Mon Nov 9 19:40:53 CET 2020


Hi,

FYI, your patch has been queued to stable release 19.11.6

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

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

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/8ce5fa4a5a81afc4af01a7b7c0aafae9fbe7d554

Thanks.

Luca Boccassi

---
>From 8ce5fa4a5a81afc4af01a7b7c0aafae9fbe7d554 Mon Sep 17 00:00:00 2001
From: Hongbo Zheng <zhenghongbo3 at huawei.com>
Date: Thu, 29 Oct 2020 20:51:56 +0800
Subject: [PATCH] net/hns3: check setting VF PCI bus return value

[ upstream commit 7ac3ae7649985c54a10f6904c298918e00a07e92 ]

Currently hns3vf_reinit_dev only judge whether the return value of
setting PCI bus function is not 0, while it will return a negative
value when execute failed.

Fixes: 243651cb6c8c ("net/hns3: check PCI config space reads")

Signed-off-by: Hongbo Zheng <zhenghongbo3 at huawei.com>
Signed-off-by: Lijun Ou <oulijun at huawei.com>
---
 drivers/net/hns3/hns3_ethdev_vf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index 5d1da44155..b61616090b 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -2147,7 +2147,7 @@ hns3vf_reinit_dev(struct hns3_adapter *hns)
 	if (hw->reset.level == HNS3_VF_FULL_RESET) {
 		rte_intr_disable(&pci_dev->intr_handle);
 		ret = hns3vf_set_bus_master(pci_dev, true);
-		if (ret) {
+		if (ret < 0) {
 			hns3_err(hw, "failed to set pci bus, ret = %d", ret);
 			return ret;
 		}
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-09 18:40:13.635309865 +0000
+++ 0065-net-hns3-check-setting-VF-PCI-bus-return-value.patch	2020-11-09 18:40:11.203312403 +0000
@@ -1 +1 @@
-From 7ac3ae7649985c54a10f6904c298918e00a07e92 Mon Sep 17 00:00:00 2001
+From 8ce5fa4a5a81afc4af01a7b7c0aafae9fbe7d554 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 7ac3ae7649985c54a10f6904c298918e00a07e92 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index 9fb7941eb3..05a9341269 100644
+index 5d1da44155..b61616090b 100644
@@ -23 +24 @@
-@@ -2619,7 +2619,7 @@ hns3vf_reinit_dev(struct hns3_adapter *hns)
+@@ -2147,7 +2147,7 @@ hns3vf_reinit_dev(struct hns3_adapter *hns)


More information about the stable mailing list