[PATCH 23/40] vdpa: vhost_vdpa_dma_batch_begin_once rename

Si-Wei Liu posted 40 patches 11 months, 3 weeks ago
[PATCH 23/40] vdpa: vhost_vdpa_dma_batch_begin_once rename
Posted by Si-Wei Liu 11 months, 3 weeks ago
No functional changes. Rename only.

Signed-off-by: Si-Wei Liu <si-wei.liu@oracle.com>
---
 hw/virtio/vhost-vdpa.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index 7a1b7f4..a6c6fe5 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -186,7 +186,7 @@ static bool vhost_vdpa_map_batch_begin(VhostVDPAShared *s)
     return true;
 }
 
-static void vhost_vdpa_iotlb_batch_begin_once(VhostVDPAShared *s)
+static void vhost_vdpa_dma_batch_begin_once(VhostVDPAShared *s)
 {
     if (!(s->backend_cap & (0x1ULL << VHOST_BACKEND_F_IOTLB_BATCH)) ||
         s->iotlb_batch_begin_sent) {
@@ -411,7 +411,7 @@ static void vhost_vdpa_listener_region_add(MemoryListener *listener,
         iova = mem_region.iova;
     }
 
-    vhost_vdpa_iotlb_batch_begin_once(s);
+    vhost_vdpa_dma_batch_begin_once(s);
     ret = vhost_vdpa_dma_map(s, VHOST_VDPA_GUEST_PA_ASID, iova,
                              int128_get64(llsize), vaddr, section->readonly);
     if (ret) {
@@ -493,7 +493,7 @@ static void vhost_vdpa_listener_region_del(MemoryListener *listener,
         iova = result->iova;
         vhost_iova_tree_remove(s->iova_tree, *result);
     }
-    vhost_vdpa_iotlb_batch_begin_once(s);
+    vhost_vdpa_dma_batch_begin_once(s);
     /*
      * The unmap ioctl doesn't accept a full 64-bit. need to check it
      */
@@ -1371,7 +1371,7 @@ static void *vhost_vdpa_load_map(void *opaque)
                                      msg->iotlb.size);
             break;
         case VHOST_IOTLB_BATCH_BEGIN:
-            vhost_vdpa_iotlb_batch_begin_once(shared);
+            vhost_vdpa_dma_batch_begin_once(shared);
             break;
         case VHOST_IOTLB_BATCH_END:
             vhost_vdpa_dma_batch_end_once(shared);
-- 
1.8.3.1
Re: [PATCH 23/40] vdpa: vhost_vdpa_dma_batch_begin_once rename
Posted by Jason Wang 10 months, 2 weeks ago
On Fri, Dec 8, 2023 at 2:51 AM Si-Wei Liu <si-wei.liu@oracle.com> wrote:
>
> No functional changes. Rename only.
>
> Signed-off-by: Si-Wei Liu <si-wei.liu@oracle.com>
> ---
>  hw/virtio/vhost-vdpa.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
> index 7a1b7f4..a6c6fe5 100644
> --- a/hw/virtio/vhost-vdpa.c
> +++ b/hw/virtio/vhost-vdpa.c
> @@ -186,7 +186,7 @@ static bool vhost_vdpa_map_batch_begin(VhostVDPAShared *s)
>      return true;
>  }
>
> -static void vhost_vdpa_iotlb_batch_begin_once(VhostVDPAShared *s)
> +static void vhost_vdpa_dma_batch_begin_once(VhostVDPAShared *s)
>  {
>      if (!(s->backend_cap & (0x1ULL << VHOST_BACKEND_F_IOTLB_BATCH)) ||
>          s->iotlb_batch_begin_sent) {
> @@ -411,7 +411,7 @@ static void vhost_vdpa_listener_region_add(MemoryListener *listener,
>          iova = mem_region.iova;
>      }
>
> -    vhost_vdpa_iotlb_batch_begin_once(s);
> +    vhost_vdpa_dma_batch_begin_once(s);
>      ret = vhost_vdpa_dma_map(s, VHOST_VDPA_GUEST_PA_ASID, iova,
>                               int128_get64(llsize), vaddr, section->readonly);
>      if (ret) {
> @@ -493,7 +493,7 @@ static void vhost_vdpa_listener_region_del(MemoryListener *listener,
>          iova = result->iova;
>          vhost_iova_tree_remove(s->iova_tree, *result);
>      }
> -    vhost_vdpa_iotlb_batch_begin_once(s);
> +    vhost_vdpa_dma_batch_begin_once(s);
>      /*
>       * The unmap ioctl doesn't accept a full 64-bit. need to check it
>       */
> @@ -1371,7 +1371,7 @@ static void *vhost_vdpa_load_map(void *opaque)
>                                       msg->iotlb.size);
>              break;
>          case VHOST_IOTLB_BATCH_BEGIN:
> -            vhost_vdpa_iotlb_batch_begin_once(shared);
> +            vhost_vdpa_dma_batch_begin_once(shared);

Nit: "iotlb" seems to be better than "dma" as there's no guarantee
that the underlayer device is using DMA (e.g simulator or VDUSE).

Thanks

>              break;
>          case VHOST_IOTLB_BATCH_END:
>              vhost_vdpa_dma_batch_end_once(shared);
> --
> 1.8.3.1
>