diff options
| author | Rob Clark <robdclark@chromium.org> | 2020-10-23 09:51:22 -0700 |
|---|---|---|
| committer | Rob Clark <robdclark@chromium.org> | 2020-11-04 16:00:57 -0800 |
| commit | f92f026a487a53d69a4a39d0a91427c19e4a4b3f (patch) | |
| tree | e14355f9ea09b90286cb17b9cbd280994788cbcc /drivers/gpu/drm/msm/msm_drv.c | |
| parent | c951a9b284b907604759628d273901064c60d09f (diff) | |
| download | lwn-f92f026a487a53d69a4a39d0a91427c19e4a4b3f.tar.gz lwn-f92f026a487a53d69a4a39d0a91427c19e4a4b3f.zip | |
drm/msm: Drop struct_mutex in madvise path
The obj->lock is sufficient for what we need.
This *does* have the implication that userspace can try to shoot
themselves in the foot by racing madvise(DONTNEED) with submit. But
the result will be about the same if they did madvise(DONTNEED) before
the submit ioctl, ie. they might not get want they want if they race
with shrinker. But iova fault handling is robust enough, so userspace
is only shooting it's own foot.
Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm/msm_drv.c')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 49e6daf30b42..f2d58fe25497 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -912,14 +912,9 @@ static int msm_ioctl_gem_madvise(struct drm_device *dev, void *data, return -EINVAL; } - ret = mutex_lock_interruptible(&dev->struct_mutex); - if (ret) - return ret; - obj = drm_gem_object_lookup(file, args->handle); if (!obj) { - ret = -ENOENT; - goto unlock; + return -ENOENT; } ret = msm_gem_madvise(obj, args->madv); @@ -928,10 +923,8 @@ static int msm_ioctl_gem_madvise(struct drm_device *dev, void *data, ret = 0; } - drm_gem_object_put_locked(obj); + drm_gem_object_put(obj); -unlock: - mutex_unlock(&dev->struct_mutex); return ret; } |