All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>,
	Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Daniel Vetter <daniel.vetter@intel.com>
Subject: [PATCH 1/2] drm/tegra: don't take dev->struct_mutex in mmap offset ioctl
Date: Wed, 15 Jul 2015 15:38:51 +0200	[thread overview]
Message-ID: <1436967532-13251-1-git-send-email-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <1436477570-4936-1-git-send-email-daniel.vetter@ffwll.ch>

Since David Herrmann's mmap vma manager rework we don't need to grab
dev->struct_mutex any more to prevent races when looking up the mmap
offset. Drop it and instead don't forget to use the unref_unlocked
variant (since the drm core still cares).

While at it also fix a leak when this ioctl is called on an imported
buffer.

Cc: Thierry Reding <thierry.reding@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 drivers/gpu/drm/tegra/gem.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/gpu/drm/tegra/gem.c b/drivers/gpu/drm/tegra/gem.c
index 01e16e146bfe..827838e64d6e 100644
--- a/drivers/gpu/drm/tegra/gem.c
+++ b/drivers/gpu/drm/tegra/gem.c
@@ -408,12 +408,9 @@ int tegra_bo_dumb_map_offset(struct drm_file *file, struct drm_device *drm,
 	struct drm_gem_object *gem;
 	struct tegra_bo *bo;
 
-	mutex_lock(&drm->struct_mutex);
-
 	gem = drm_gem_object_lookup(drm, file, handle);
 	if (!gem) {
 		dev_err(drm->dev, "failed to lookup GEM object\n");
-		mutex_unlock(&drm->struct_mutex);
 		return -EINVAL;
 	}
 
@@ -423,8 +420,6 @@ int tegra_bo_dumb_map_offset(struct drm_file *file, struct drm_device *drm,
 
 	drm_gem_object_unreference(gem);
 
-	mutex_unlock(&drm->struct_mutex);
-
 	return 0;
 }
 
-- 
2.1.4

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

  parent reply	other threads:[~2015-07-15 13:36 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-09 21:32 [PATCH 00/18] dev->struct_mutex crusade Daniel Vetter
2015-07-09 21:32 ` [PATCH 01/18] drm/gem: rip out drm vma accounting for gem mmaps Daniel Vetter
2015-07-11 21:11   ` Chris Wilson
2015-07-14 10:21     ` Daniel Vetter
2015-08-10 11:32   ` Thierry Reding
2015-07-09 21:32 ` [PATCH 02/18] drm/cma-helper: Fix locking in drm_fb_cma_debugfs_show Daniel Vetter
2015-08-10 10:41   ` Thierry Reding
2015-07-09 21:32 ` [PATCH 03/18] drm/gem: Be more friendly with locking checks Daniel Vetter
2015-08-10 10:42   ` Thierry Reding
2015-08-10 11:43     ` Daniel Vetter
2015-07-09 21:32 ` [PATCH 04/18] drm/ast: Don't grab dev->struct_mutex for in mmap offset ioctl Daniel Vetter
2015-08-10 10:46   ` Thierry Reding
2015-07-09 21:32 ` [PATCH 05/18] drm/bochs: " Daniel Vetter
2015-08-10 10:45   ` Thierry Reding
2015-07-09 21:32 ` [PATCH 06/18] drm/mga200g: " Daniel Vetter
2015-08-10 10:46   ` Thierry Reding
2015-07-09 21:32 ` [PATCH 07/18] drm/mga200g: Hold a proper reference for cursor_set Daniel Vetter
2015-08-10 10:46   ` Thierry Reding
2015-07-09 21:32 ` [PATCH 08/18] drm/cirrus: Don't grab dev->struct_mutex for in mmap offset ioctl Daniel Vetter
2015-08-10 10:53   ` Thierry Reding
2015-07-09 21:32 ` [PATCH 09/18] drm/cma-helper: " Daniel Vetter
2015-08-10 10:54   ` Thierry Reding
2015-07-09 21:32 ` [PATCH 10/18] drm/rockchip: " Daniel Vetter
2015-08-10 10:58   ` Thierry Reding
2015-07-09 21:32 ` [PATCH 11/18] drm/armada: " Daniel Vetter
2015-08-10 10:59   ` Thierry Reding
2015-08-10 11:15   ` Russell King - ARM Linux
2015-07-09 21:32 ` [PATCH 12/18] drm/nouveau: Don't take dev->struct_mutex in fbcon init Daniel Vetter
2015-08-10 10:59   ` Thierry Reding
2015-07-09 21:32 ` [PATCH 13/18] drm/nouveau: Don't take dev->struct_mutex in ttm_fini Daniel Vetter
2015-08-10 10:59   ` Thierry Reding
2015-07-09 21:32 ` [PATCH 14/18] drm/qxl: Don't take dev->struct_mutex in bo_force_delete Daniel Vetter
2015-08-10 10:59   ` Thierry Reding
2015-07-09 21:32 ` [PATCH 15/18] drm/radeon: " Daniel Vetter
2015-08-10 11:00   ` Thierry Reding
2015-07-09 21:32 ` [PATCH 16/18] drm/radeon: Don't take dev->struct_mutex in pm functions Daniel Vetter
2015-08-10 11:00   ` Thierry Reding
2015-07-09 21:32 ` [PATCH 17/18] drm/amdgpu: Don't take dev->struct_mutex in bo_force_delete Daniel Vetter
2015-08-10 10:53   ` Thierry Reding
2015-07-09 21:32 ` [PATCH 18/18] drm/amdgpu: don't grab dev->struct_mutex in pm functions Daniel Vetter
2015-07-10  0:20   ` shuang.he
2015-08-10 11:00   ` Thierry Reding
2015-07-15 13:38 ` Daniel Vetter [this message]
2015-07-15 13:38   ` [PATCH 2/2] drm/tegra: Use drm_gem_object_reference_unlocked Daniel Vetter
2015-07-19 10:43     ` shuang.he
2015-08-10 10:30   ` [PATCH 1/2] drm/tegra: don't take dev->struct_mutex in mmap offset ioctl Thierry Reding
2015-08-10 11:31     ` Daniel Vetter
2015-08-10 11:38       ` Thierry Reding
2015-08-10 11:35 ` [PATCH 00/18] dev->struct_mutex crusade Thierry Reding
2015-08-10 11:53   ` Chris Wilson
2015-08-10 11:56     ` Thierry Reding
2015-08-10 12:00   ` Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1436967532-13251-1-git-send-email-daniel.vetter@ffwll.ch \
    --to=daniel.vetter@ffwll.ch \
    --cc=daniel.vetter@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.