net/ifc: fix function name

Message ID 20180925031001.164277-1-xiao.w.wang@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers
Series net/ifc: fix function name |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Xiao Wang Sept. 25, 2018, 3:10 a.m. UTC
  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@intel.com>
---
 drivers/net/ifc/ifcvf_vdpa.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
  

Comments

Xiaolong Ye Oct. 10, 2018, 9:41 a.m. UTC | #1
Acked-by: Ye Xiaolong <xiaolong.ye@intel.com>

Thanks,
Xiaolong

On 09/25, Xiao Wang wrote:
>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@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 7d3085d8d..a26da8086 100644
>--- a/drivers/net/ifc/ifcvf_vdpa.c
>+++ b/drivers/net/ifc/ifcvf_vdpa.c
>@@ -206,7 +206,7 @@ ifcvf_dma_map(struct ifcvf_internal *internal, int do_map)
> }
> 
> 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;
> 	struct rte_vhost_mem_region *reg;
>@@ -219,9 +219,9 @@ qva_to_gpa(int vid, uint64_t qva)
> 	for (i = 0; i < mem->nregions; i++) {
> 		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,21 +247,21 @@ 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.");
> 			return -1;
> 		}
> 		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.");
> 			return -1;
> 		}
> 		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.");
> 			return -1;
>-- 
>2.15.1
>
  
Qi Zhang Oct. 11, 2018, 3:09 a.m. UTC | #2
> -----Original Message-----
> From: Ye, Xiaolong
> Sent: Wednesday, October 10, 2018 2:42 AM
> To: Wang, Xiao W <xiao.w.wang@intel.com>
> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; dev@dpdk.org
> Subject: Re: [PATCH] net/ifc: fix function name
> 
> Acked-by: Ye Xiaolong <xiaolong.ye@intel.com>
> 
> Thanks,
> Xiaolong
> 
> On 09/25, Xiao Wang wrote:
> >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@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
  

Patch

diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifc/ifcvf_vdpa.c
index 7d3085d8d..a26da8086 100644
--- a/drivers/net/ifc/ifcvf_vdpa.c
+++ b/drivers/net/ifc/ifcvf_vdpa.c
@@ -206,7 +206,7 @@  ifcvf_dma_map(struct ifcvf_internal *internal, int do_map)
 }
 
 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;
 	struct rte_vhost_mem_region *reg;
@@ -219,9 +219,9 @@  qva_to_gpa(int vid, uint64_t qva)
 	for (i = 0; i < mem->nregions; i++) {
 		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,21 +247,21 @@  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.");
 			return -1;
 		}
 		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.");
 			return -1;
 		}
 		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.");
 			return -1;