Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1665754

Re: [PATCH 1/7] vfio: Fix group release deadlock

Show all headers | View raw

Hi Alex,

On 09/06/2017 23:59, Alex Williamson wrote:
> If vfio_iommu_group_notifier() acquires a group reference and that
> reference becomes the last reference to the group, then vfio_group_put
> introduces a deadlock code path where we're trying to unregister from
> the iommu notifier chain from within a callout of that chain.  Use a
> work_struct to release this reference asynchronously.
> 
> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> ---
>  drivers/vfio/vfio.c |   37 ++++++++++++++++++++++++++++++++++++-
>  1 file changed, 36 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
> index 561084ab387f..f2e24d5699f2 100644
> --- a/drivers/vfio/vfio.c
> +++ b/drivers/vfio/vfio.c
> @@ -423,6 +423,34 @@ static void vfio_group_put(struct vfio_group *group)
>  	kref_put_mutex(&group->kref, vfio_group_release, &vfio.group_lock);
>  }
>  
> +struct vfio_group_put_work {
> +	struct work_struct work;
> +	struct vfio_group *group;
> +};
> +
> +static void vfio_group_put_bg(struct work_struct *work)
> +{
> +	struct vfio_group_put_work *do_work;
> +
> +	do_work = container_of(work, struct vfio_group_put_work, work);
> +
> +	vfio_group_put(do_work->group);
> +	kfree(do_work);
> +}
> +
> +static void vfio_group_schedule_put(struct vfio_group *group)
> +{
> +	struct vfio_group_put_work *do_work;
> +
> +	do_work = kmalloc(sizeof(*do_work), GFP_KERNEL);
> +	if (WARN_ON(!do_work))
> +		return;
> +
> +	INIT_WORK(&do_work->work, vfio_group_put_bg);
> +	do_work->group = group;
> +	schedule_work(&do_work->work);
> +}
> +
>  /* Assume group_lock or group reference is held */
>  static void vfio_group_get(struct vfio_group *group)
>  {
> @@ -762,7 +790,14 @@ static int vfio_iommu_group_notifier(struct notifier_block *nb,
>  		break;
>  	}
>  
> -	vfio_group_put(group);
> +	/*
> +	 * If we're the last reference to the group, the group will be
> +	 * released, which includes unregistering the iommu group notifier.
> +	 * We hold a read-lock on that notifier list, unregistering needs
> +	 * a write-lock... deadlock.  Release our reference asyncronously
nit: s/asyncronously/asynchronously

Reviewed-by: Eric Auger <eric.auger@redhat.com>

Thanks

Eric


> +	 * to avoid that situation.
> +	 */
> +	vfio_group_schedule_put(group);
>  	return NOTIFY_OK;
>  }
>  
> 

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/7] vfio: Fix release ordering races and use driver_override Alex Williamson <alex.williamson@redhat.com> - 2017-06-10 00:00 +0200
  [PATCH 3/7] vfio: New external user group/file match Alex Williamson <alex.williamson@redhat.com> - 2017-06-10 00:10 +0200
    Re: [PATCH 3/7] vfio: New external user group/file match Paolo Bonzini <pbonzini@redhat.com> - 2017-06-12 18:30 +0200
    Re: [PATCH 3/7] vfio: New external user group/file match Auger Eric <eric.auger@redhat.com> - 2017-06-14 14:50 +0200
  [PATCH 6/7] vfio: Register pci, platform, amba, and mdev bus drivers Alex Williamson <alex.williamson@redhat.com> - 2017-06-10 00:10 +0200
    Re: [PATCH 6/7] vfio: Register pci, platform, amba, and mdev bus  drivers Auger Eric <eric.auger@redhat.com> - 2017-06-14 15:20 +0200
  [PATCH 2/7] kvm-vfio: Decouple only when we match a group Alex Williamson <alex.williamson@redhat.com> - 2017-06-10 00:10 +0200
    Re: [PATCH 2/7] kvm-vfio: Decouple only when we match a group Paolo Bonzini <pbonzini@redhat.com> - 2017-06-12 18:30 +0200
    Re: [PATCH 2/7] kvm-vfio: Decouple only when we match a group Auger Eric <eric.auger@redhat.com> - 2017-06-14 14:40 +0200
  [PATCH 7/7] vfio: Use driver_override to avert binding to  compromising drivers Alex Williamson <alex.williamson@redhat.com> - 2017-06-10 00:10 +0200
    Re: [PATCH 7/7] vfio: Use driver_override to avert binding to  compromising drivers Auger Eric <eric.auger@redhat.com> - 2017-06-19 16:10 +0200
  [PATCH 1/7] vfio: Fix group release deadlock Alex Williamson <alex.williamson@redhat.com> - 2017-06-10 00:10 +0200
    Re: [PATCH 1/7] vfio: Fix group release deadlock Auger Eric <eric.auger@redhat.com> - 2017-06-14 14:40 +0200
  [PATCH 5/7] vfio: Create interface for vfio bus drivers to register Alex Williamson <alex.williamson@redhat.com> - 2017-06-10 00:10 +0200
    Re: [PATCH 5/7] vfio: Create interface for vfio bus drivers to  register Auger Eric <eric.auger@redhat.com> - 2017-06-14 15:20 +0200
  [PATCH 4/7] iommu: Add driver-not-bound notification Alex Williamson <alex.williamson@redhat.com> - 2017-06-10 00:10 +0200
    Re: [PATCH 4/7] iommu: Add driver-not-bound notification Joerg Roedel <joro@8bytes.org> - 2017-06-10 00:30 +0200
      Re: [PATCH 4/7] iommu: Add driver-not-bound notification Alex Williamson <alex.williamson@redhat.com> - 2017-06-10 00:50 +0200
        Re: [PATCH 4/7] iommu: Add driver-not-bound notification Joerg Roedel <joro@8bytes.org> - 2017-06-10 23:50 +0200
    Re: [PATCH 4/7] iommu: Add driver-not-bound notification Auger Eric <eric.auger@redhat.com> - 2017-06-14 15:00 +0200

csiph-web