[dpdk-stable] patch 'net/netvsc: fix chimney buffer size error handling' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.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 11/23/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From 66b526bffe5b09d7991e6ac5449b1e1336197489 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <sthemmin at microsoft.com>
Date: Thu, 9 Aug 2018 10:50:05 -0700
Subject: [PATCH] net/netvsc: fix chimney buffer size error handling

[ upstream commit 99e3d0e72f0bf34a39bf57d4b363730994eb5a59 ]

Fix the error handling in setting up transmit buffer.
If setting up chimney buffer fails, then it is not connected so
no need to send disconnect.

Allow for some unused area if full area is not used.

Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device")

Signed-off-by: Stephen Hemminger <sthemmin at microsoft.com>
---
 drivers/net/netvsc/hn_nvs.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/net/netvsc/hn_nvs.c b/drivers/net/netvsc/hn_nvs.c
index 77d3b839f..a458bb720 100644
--- a/drivers/net/netvsc/hn_nvs.c
+++ b/drivers/net/netvsc/hn_nvs.c
@@ -280,5 +280,5 @@ hn_nvs_conn_chim(struct hn_data *hv)
 	if (error) {
 		PMD_DRV_LOG(ERR, "exec nvs chim conn failed");
-		goto cleanup;
+		return error;
 	}
 
@@ -286,6 +286,5 @@ hn_nvs_conn_chim(struct hn_data *hv)
 		PMD_DRV_LOG(ERR, "nvs chim conn failed: %x",
 			    resp.status);
-		error = -EIO;
-		goto cleanup;
+		return -EIO;
 	}
 
@@ -296,5 +295,6 @@ hn_nvs_conn_chim(struct hn_data *hv)
 			    "invalid chimney sending buffer section size: %u",
 			    sectsz);
-		return 0;
+		error = -EINVAL;
+		goto cleanup;
 	}
 
@@ -305,9 +305,4 @@ hn_nvs_conn_chim(struct hn_data *hv)
 		    len, hv->chim_szmax, hv->chim_cnt);
 
-	if (len % hv->chim_szmax != 0) {
-		PMD_DRV_LOG(NOTICE,
-			    "chimney sending sections are not properly aligned");
-	}
-
 	/* Done! */
 	return 0;
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-20 17:53:07.665777909 +0000
+++ 0008-net-netvsc-fix-chimney-buffer-size-error-handling.patch	2018-11-20 17:53:07.000000000 +0000
@@ -1,8 +1,10 @@
-From 99e3d0e72f0bf34a39bf57d4b363730994eb5a59 Mon Sep 17 00:00:00 2001
+From 66b526bffe5b09d7991e6ac5449b1e1336197489 Mon Sep 17 00:00:00 2001
 From: Stephen Hemminger <sthemmin at microsoft.com>
 Date: Thu, 9 Aug 2018 10:50:05 -0700
 Subject: [PATCH] net/netvsc: fix chimney buffer size error handling
 
+[ upstream commit 99e3d0e72f0bf34a39bf57d4b363730994eb5a59 ]
+
 Fix the error handling in setting up transmit buffer.
 If setting up chimney buffer fails, then it is not connected so
 no need to send disconnect.
@@ -10,7 +12,6 @@
 Allow for some unused area if full area is not used.
 
 Fixes: 4e9c73e96e83 ("net/netvsc: add Hyper-V network device")
-Cc: stable at dpdk.org
 
 Signed-off-by: Stephen Hemminger <sthemmin at microsoft.com>
 ---