| Message ID | 1701970793-6865-8-git-send-email-si-wei.liu@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | vdpa-net: improve migration downtime through descriptor ASID and persistent IOTLB | expand |
On Thu, Dec 7, 2023 at 7:50 PM Si-Wei Liu <si-wei.liu@oracle.com> wrote: > > Move it a few lines ahead to make function call easier for those > before it. No funtional change involved. > > Signed-off-by: Si-Wei Liu <si-wei.liu@oracle.com> Reviewed-by: Eugenio Pérez <eperezma@redhat.com> > --- > net/vhost-vdpa.c | 36 ++++++++++++++++++------------------ > 1 file changed, 18 insertions(+), 18 deletions(-) > > diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c > index 1a738b2..dbfa192 100644 > --- a/net/vhost-vdpa.c > +++ b/net/vhost-vdpa.c > @@ -335,6 +335,24 @@ static void vdpa_net_migration_state_notifier(Notifier *notifier, void *data) > } > } > > +static int vhost_vdpa_set_address_space_id(struct vhost_vdpa *v, > + unsigned vq_group, > + unsigned asid_num) > +{ > + struct vhost_vring_state asid = { > + .index = vq_group, > + .num = asid_num, > + }; > + int r; > + > + r = ioctl(v->shared->device_fd, VHOST_VDPA_SET_GROUP_ASID, &asid); > + if (unlikely(r < 0)) { > + error_report("Can't set vq group %u asid %u, errno=%d (%s)", > + asid.index, asid.num, errno, g_strerror(errno)); > + } > + return r; > +} > + > static void vhost_vdpa_net_data_start_first(VhostVDPAState *s) > { > struct vhost_vdpa *v = &s->vhost_vdpa; > @@ -490,24 +508,6 @@ static int64_t vhost_vdpa_get_vring_desc_group(int device_fd, > return state.num; > } > > -static int vhost_vdpa_set_address_space_id(struct vhost_vdpa *v, > - unsigned vq_group, > - unsigned asid_num) > -{ > - struct vhost_vring_state asid = { > - .index = vq_group, > - .num = asid_num, > - }; > - int r; > - > - r = ioctl(v->shared->device_fd, VHOST_VDPA_SET_GROUP_ASID, &asid); > - if (unlikely(r < 0)) { > - error_report("Can't set vq group %u asid %u, errno=%d (%s)", > - asid.index, asid.num, errno, g_strerror(errno)); > - } > - return r; > -} > - > static void vhost_vdpa_cvq_unmap_buf(struct vhost_vdpa *v, void *addr) > { > VhostIOVATree *tree = v->shared->iova_tree; > -- > 1.8.3.1 >
On Fri, Dec 8, 2023 at 2:50 AM Si-Wei Liu <si-wei.liu@oracle.com> wrote: > > Move it a few lines ahead to make function call easier for those > before it. No funtional change involved. Typo for functional. > > Signed-off-by: Si-Wei Liu <si-wei.liu@oracle.com> Acked-by: Jason Wang <jasowang@redhat.com> Thanks > --- > net/vhost-vdpa.c | 36 ++++++++++++++++++------------------ > 1 file changed, 18 insertions(+), 18 deletions(-) > > diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c > index 1a738b2..dbfa192 100644 > --- a/net/vhost-vdpa.c > +++ b/net/vhost-vdpa.c > @@ -335,6 +335,24 @@ static void vdpa_net_migration_state_notifier(Notifier *notifier, void *data) > } > } > > +static int vhost_vdpa_set_address_space_id(struct vhost_vdpa *v, > + unsigned vq_group, > + unsigned asid_num) > +{ > + struct vhost_vring_state asid = { > + .index = vq_group, > + .num = asid_num, > + }; > + int r; > + > + r = ioctl(v->shared->device_fd, VHOST_VDPA_SET_GROUP_ASID, &asid); > + if (unlikely(r < 0)) { > + error_report("Can't set vq group %u asid %u, errno=%d (%s)", > + asid.index, asid.num, errno, g_strerror(errno)); > + } > + return r; > +} > + > static void vhost_vdpa_net_data_start_first(VhostVDPAState *s) > { > struct vhost_vdpa *v = &s->vhost_vdpa; > @@ -490,24 +508,6 @@ static int64_t vhost_vdpa_get_vring_desc_group(int device_fd, > return state.num; > } > > -static int vhost_vdpa_set_address_space_id(struct vhost_vdpa *v, > - unsigned vq_group, > - unsigned asid_num) > -{ > - struct vhost_vring_state asid = { > - .index = vq_group, > - .num = asid_num, > - }; > - int r; > - > - r = ioctl(v->shared->device_fd, VHOST_VDPA_SET_GROUP_ASID, &asid); > - if (unlikely(r < 0)) { > - error_report("Can't set vq group %u asid %u, errno=%d (%s)", > - asid.index, asid.num, errno, g_strerror(errno)); > - } > - return r; > -} > - > static void vhost_vdpa_cvq_unmap_buf(struct vhost_vdpa *v, void *addr) > { > VhostIOVATree *tree = v->shared->iova_tree; > -- > 1.8.3.1 >
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c index 1a738b2..dbfa192 100644 --- a/net/vhost-vdpa.c +++ b/net/vhost-vdpa.c @@ -335,6 +335,24 @@ static void vdpa_net_migration_state_notifier(Notifier *notifier, void *data) } } +static int vhost_vdpa_set_address_space_id(struct vhost_vdpa *v, + unsigned vq_group, + unsigned asid_num) +{ + struct vhost_vring_state asid = { + .index = vq_group, + .num = asid_num, + }; + int r; + + r = ioctl(v->shared->device_fd, VHOST_VDPA_SET_GROUP_ASID, &asid); + if (unlikely(r < 0)) { + error_report("Can't set vq group %u asid %u, errno=%d (%s)", + asid.index, asid.num, errno, g_strerror(errno)); + } + return r; +} + static void vhost_vdpa_net_data_start_first(VhostVDPAState *s) { struct vhost_vdpa *v = &s->vhost_vdpa; @@ -490,24 +508,6 @@ static int64_t vhost_vdpa_get_vring_desc_group(int device_fd, return state.num; } -static int vhost_vdpa_set_address_space_id(struct vhost_vdpa *v, - unsigned vq_group, - unsigned asid_num) -{ - struct vhost_vring_state asid = { - .index = vq_group, - .num = asid_num, - }; - int r; - - r = ioctl(v->shared->device_fd, VHOST_VDPA_SET_GROUP_ASID, &asid); - if (unlikely(r < 0)) { - error_report("Can't set vq group %u asid %u, errno=%d (%s)", - asid.index, asid.num, errno, g_strerror(errno)); - } - return r; -} - static void vhost_vdpa_cvq_unmap_buf(struct vhost_vdpa *v, void *addr) { VhostIOVATree *tree = v->shared->iova_tree;
Move it a few lines ahead to make function call easier for those before it. No funtional change involved. Signed-off-by: Si-Wei Liu <si-wei.liu@oracle.com> --- net/vhost-vdpa.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)