[dpdk-stable] patch 'net/ifc: fix address translation function name' 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/27/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 85caea0e16c6e040584cbdaf5799049f635d3c1c Mon Sep 17 00:00:00 2001
From: Xiao Wang <xiao.w.wang at intel.com>
Date: Tue, 25 Sep 2018 11:10:01 +0800
Subject: [PATCH] net/ifc: fix address translation function name

[ upstream commit 3e2923cffac1459a65f5584cc851d27b0ed0865c ]

The address translation from user virtual address to guest physical
address should not be named as qva_to_gpa.

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

Signed-off-by: Xiao Wang <xiao.w.wang at intel.com>
Acked-by: Xiaolong Ye <xiaolong.ye at intel.com>
---
 drivers/net/ifc/ifcvf_vdpa.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifc/ifcvf_vdpa.c
index b9d006814..a11a2ec0d 100644
--- a/drivers/net/ifc/ifcvf_vdpa.c
+++ b/drivers/net/ifc/ifcvf_vdpa.c
@@ -206,5 +206,5 @@ exit:
 
 static uint64_t
-qva_to_gpa(int vid, uint64_t qva)
+hva_to_gpa(int vid, uint64_t hva)
 {
 	struct rte_vhost_memory *mem = NULL;
@@ -219,7 +219,7 @@ qva_to_gpa(int vid, uint64_t qva)
 		reg = &mem->regions[i];
 
-		if (qva >= reg->host_user_addr &&
-				qva < reg->host_user_addr + reg->size) {
-			gpa = qva - reg->host_user_addr + reg->guest_phys_addr;
+		if (hva >= reg->host_user_addr &&
+				hva < reg->host_user_addr + reg->size) {
+			gpa = hva - reg->host_user_addr + reg->guest_phys_addr;
 			break;
 		}
@@ -247,5 +247,5 @@ vdpa_ifcvf_start(struct ifcvf_internal *internal)
 	for (i = 0; i < nr_vring; i++) {
 		rte_vhost_get_vhost_vring(vid, i, &vq);
-		gpa = qva_to_gpa(vid, (uint64_t)(uintptr_t)vq.desc);
+		gpa = hva_to_gpa(vid, (uint64_t)(uintptr_t)vq.desc);
 		if (gpa == 0) {
 			DRV_LOG(ERR, "Fail to get GPA for descriptor ring.");
@@ -254,5 +254,5 @@ vdpa_ifcvf_start(struct ifcvf_internal *internal)
 		hw->vring[i].desc = gpa;
 
-		gpa = qva_to_gpa(vid, (uint64_t)(uintptr_t)vq.avail);
+		gpa = hva_to_gpa(vid, (uint64_t)(uintptr_t)vq.avail);
 		if (gpa == 0) {
 			DRV_LOG(ERR, "Fail to get GPA for available ring.");
@@ -261,5 +261,5 @@ vdpa_ifcvf_start(struct ifcvf_internal *internal)
 		hw->vring[i].avail = gpa;
 
-		gpa = qva_to_gpa(vid, (uint64_t)(uintptr_t)vq.used);
+		gpa = hva_to_gpa(vid, (uint64_t)(uintptr_t)vq.used);
 		if (gpa == 0) {
 			DRV_LOG(ERR, "Fail to get GPA for used ring.");
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-21 16:44:32.695325295 +0000
+++ 0064-net-ifc-fix-address-translation-function-name.patch	2018-11-21 16:44:30.000000000 +0000
@@ -1,13 +1,14 @@
-From 3e2923cffac1459a65f5584cc851d27b0ed0865c Mon Sep 17 00:00:00 2001
+From 85caea0e16c6e040584cbdaf5799049f635d3c1c Mon Sep 17 00:00:00 2001
 From: Xiao Wang <xiao.w.wang at intel.com>
 Date: Tue, 25 Sep 2018 11:10:01 +0800
 Subject: [PATCH] net/ifc: fix address translation function name
 
+[ upstream commit 3e2923cffac1459a65f5584cc851d27b0ed0865c ]
+
 The address translation from user virtual address to guest physical
 address should not be named as qva_to_gpa.
 
 Fixes: a3f8150eac6d ("net/ifcvf: add ifcvf vDPA driver")
-Cc: stable at dpdk.org
 
 Signed-off-by: Xiao Wang <xiao.w.wang at intel.com>
 Acked-by: Xiaolong Ye <xiaolong.ye at intel.com>
@@ -16,17 +17,17 @@
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifc/ifcvf_vdpa.c
-index 9d5594678..0d237ae40 100644
+index b9d006814..a11a2ec0d 100644
 --- a/drivers/net/ifc/ifcvf_vdpa.c
 +++ b/drivers/net/ifc/ifcvf_vdpa.c
-@@ -207,5 +207,5 @@ exit:
+@@ -206,5 +206,5 @@ exit:
  
  static uint64_t
 -qva_to_gpa(int vid, uint64_t qva)
 +hva_to_gpa(int vid, uint64_t hva)
  {
  	struct rte_vhost_memory *mem = NULL;
-@@ -220,7 +220,7 @@ qva_to_gpa(int vid, uint64_t qva)
+@@ -219,7 +219,7 @@ qva_to_gpa(int vid, uint64_t qva)
  		reg = &mem->regions[i];
  
 -		if (qva >= reg->host_user_addr &&
@@ -37,21 +38,21 @@
 +			gpa = hva - reg->host_user_addr + reg->guest_phys_addr;
  			break;
  		}
-@@ -248,5 +248,5 @@ vdpa_ifcvf_start(struct ifcvf_internal *internal)
+@@ -247,5 +247,5 @@ vdpa_ifcvf_start(struct ifcvf_internal *internal)
  	for (i = 0; i < nr_vring; i++) {
  		rte_vhost_get_vhost_vring(vid, i, &vq);
 -		gpa = qva_to_gpa(vid, (uint64_t)(uintptr_t)vq.desc);
 +		gpa = hva_to_gpa(vid, (uint64_t)(uintptr_t)vq.desc);
  		if (gpa == 0) {
  			DRV_LOG(ERR, "Fail to get GPA for descriptor ring.");
-@@ -255,5 +255,5 @@ vdpa_ifcvf_start(struct ifcvf_internal *internal)
+@@ -254,5 +254,5 @@ vdpa_ifcvf_start(struct ifcvf_internal *internal)
  		hw->vring[i].desc = gpa;
  
 -		gpa = qva_to_gpa(vid, (uint64_t)(uintptr_t)vq.avail);
 +		gpa = hva_to_gpa(vid, (uint64_t)(uintptr_t)vq.avail);
  		if (gpa == 0) {
  			DRV_LOG(ERR, "Fail to get GPA for available ring.");
-@@ -262,5 +262,5 @@ vdpa_ifcvf_start(struct ifcvf_internal *internal)
+@@ -261,5 +261,5 @@ vdpa_ifcvf_start(struct ifcvf_internal *internal)
  		hw->vring[i].avail = gpa;
  
 -		gpa = qva_to_gpa(vid, (uint64_t)(uintptr_t)vq.used);