On Fri, Dec 8, 2023 at 2:50 AM Si-Wei Liu <[email protected]> wrote:
>
> So that it can be freed from vhost_vdpa_cleanup on
> the last deref. The next few patches will try to
> make iova tree life cycle not depend on memory
> listener, and there's possiblity to keep iova tree
> around when memory mapping is not changed across
> device reset.
>
> Signed-off-by: Si-Wei Liu <[email protected]>
> ---
> net/vhost-vdpa.c | 9 ++-------
> 1 file changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
> index a126e5c..7b8f047 100644
> --- a/net/vhost-vdpa.c
> +++ b/net/vhost-vdpa.c
> @@ -238,6 +238,8 @@ static void vhost_vdpa_cleanup(NetClientState *nc)
> }
> if (--s->vhost_vdpa.shared->refcnt == 0) {
> qemu_close(s->vhost_vdpa.shared->device_fd);
> + g_clear_pointer(&s->vhost_vdpa.shared->iova_tree,
> + vhost_iova_tree_delete);
Could be part of the put() as well.
Thanks
> g_free(s->vhost_vdpa.shared);
> }
> s->vhost_vdpa.shared = NULL;
> @@ -461,19 +463,12 @@ static int vhost_vdpa_net_data_load(NetClientState *nc)
> static void vhost_vdpa_net_client_stop(NetClientState *nc)
> {
> VhostVDPAState *s = DO_UPCAST(VhostVDPAState, nc, nc);
> - struct vhost_dev *dev;
>
> assert(nc->info->type == NET_CLIENT_DRIVER_VHOST_VDPA);
>
> if (s->vhost_vdpa.index == 0) {
> migration_remove_notifier(&s->migration_state);
> }
> -
> - dev = s->vhost_vdpa.dev;
> - if (dev->vq_index + dev->nvqs == dev->vq_index_end) {
> - g_clear_pointer(&s->vhost_vdpa.shared->iova_tree,
> - vhost_iova_tree_delete);
> - }
> }
>
> static int vhost_vdpa_net_load_setup(NetClientState *nc, NICState *nic)
> --
> 1.8.3.1
>
