[PATCH 2/2] drm/radeon: finally fix the racy VMA setup

[Alex Deucher]

On Thu, Nov 7, 2019 at 7:03 AM Christian König
<ckoenig.leichtzumerken at gmail.com> wrote:
>
> Hey Alex,
>
> any objections that I merge those two patches through drm-misc-next?
>
> It's a cleanup I wanted to do for years and Thomas finally fixed up TTM
> for this.

Fine with me.  Series is:
Acked-by: Alex Deucher <alexander.deucher at amd.com>

>
> Cheers,
> Christian.
>
> Am 07.11.19 um 13:01 schrieb Christian König:
> > From: Christian König <ckoenig.leichtzumerken at gmail.com>
> >
> > Finally clean up the VMA setup for radeon now that TTM exports the
> > necessary functions.
> >
> > No functional change, but only compile tested.
> >
> > Signed-off-by: Christian König <christian.koenig at amd.com>
> > Reviewed-by: Huang Rui <ray.huang at amd.com>
> > ---
> >   drivers/gpu/drm/radeon/radeon_ttm.c | 29 ++++++++++++++---------------
> >   1 file changed, 14 insertions(+), 15 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
> > index 098bc9f40b98..91993a233cb0 100644
> > --- a/drivers/gpu/drm/radeon/radeon_ttm.c
> > +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
> > @@ -881,9 +881,6 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
> >       man->size = size >> PAGE_SHIFT;
> >   }
> >
> > -static struct vm_operations_struct radeon_ttm_vm_ops;
> > -static const struct vm_operations_struct *ttm_vm_ops = NULL;
> > -
> >   static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
> >   {
> >       struct ttm_buffer_object *bo;
> > @@ -891,34 +888,36 @@ static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
> >       vm_fault_t ret;
> >
> >       bo = (struct ttm_buffer_object *)vmf->vma->vm_private_data;
> > -     if (bo == NULL) {
> > +     if (bo == NULL)
> >               return VM_FAULT_NOPAGE;
> > -     }
> > +
> >       rdev = radeon_get_rdev(bo->bdev);
> >       down_read(&rdev->pm.mclk_lock);
> > -     ret = ttm_vm_ops->fault(vmf);
> > +     ret = ttm_bo_vm_fault(vmf);
> >       up_read(&rdev->pm.mclk_lock);
> >       return ret;
> >   }
> >
> > +static struct vm_operations_struct radeon_ttm_vm_ops = {
> > +     .fault = radeon_ttm_fault,
> > +     .open = ttm_bo_vm_open,
> > +     .close = ttm_bo_vm_close,
> > +     .access = ttm_bo_vm_access
> > +};
> > +
> >   int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
> >   {
> >       int r;
> >       struct drm_file *file_priv = filp->private_data;
> >       struct radeon_device *rdev = file_priv->minor->dev->dev_private;
> >
> > -     if (rdev == NULL) {
> > +     if (rdev == NULL)
> >               return -EINVAL;
> > -     }
> > +
> >       r = ttm_bo_mmap(filp, vma, &rdev->mman.bdev);
> > -     if (unlikely(r != 0)) {
> > +     if (unlikely(r != 0))
> >               return r;
> > -     }
> > -     if (unlikely(ttm_vm_ops == NULL)) {
> > -             ttm_vm_ops = vma->vm_ops;
> > -             radeon_ttm_vm_ops = *ttm_vm_ops;
> > -             radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
> > -     }
> > +
> >       vma->vm_ops = &radeon_ttm_vm_ops;
> >       return 0;
> >   }
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx