All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
	DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	Daniel Vetter <daniel.vetter@intel.com>,
	Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>,
	linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org
Subject: [PATCH 3/3] drm/msm: Don't init ww_mutec acquire ctx before needed
Date: Tue, 19 Nov 2019 22:08:44 +0100	[thread overview]
Message-ID: <20191119210844.16947-4-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20191119210844.16947-1-daniel.vetter@ffwll.ch>

For locking semantics it really doesn't matter when we grab the
ticket. But for lockdep validation it does: the acquire ctx is a fake
lockdep. Since other drivers might want to do a full multi-lock dance
in their fault-handler, not just lock a single dma_resv. Therefore we
must init the acquire_ctx only after we've done all the copy_*_user or
anything else that might trigger a pagefault. For msm this means we
need to move it past submit_lookup_objects.

Aside: Why is msm still using struct_mutex, it seems to be using
dma_resv_lock for general buffer state protection?

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Sean Paul <sean@poorly.run>
Cc: linux-arm-msm@vger.kernel.org
Cc: freedreno@lists.freedesktop.org
---
 drivers/gpu/drm/msm/msm_gem_submit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
index fb1fdd7fa3ef..126b2f62bfe7 100644
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -54,7 +54,6 @@ static struct msm_gem_submit *submit_create(struct drm_device *dev,
 
 	INIT_LIST_HEAD(&submit->node);
 	INIT_LIST_HEAD(&submit->bo_list);
-	ww_acquire_init(&submit->ticket, &reservation_ww_class);
 
 	return submit;
 }
@@ -489,6 +488,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
 	if (ret)
 		goto out;
 
+	ww_acquire_init(&submit->ticket, &reservation_ww_class);
 	ret = submit_lock_objects(submit);
 	if (ret)
 		goto out;
-- 
2.24.0


WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
	DRI Development <dri-devel@lists.freedesktop.org>
Cc: Sean Paul <sean@poorly.run>,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	linux-arm-msm@vger.kernel.org,
	Daniel Vetter <daniel.vetter@intel.com>,
	freedreno@lists.freedesktop.org
Subject: [PATCH 3/3] drm/msm: Don't init ww_mutec acquire ctx before needed
Date: Tue, 19 Nov 2019 22:08:44 +0100	[thread overview]
Message-ID: <20191119210844.16947-4-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20191119210844.16947-1-daniel.vetter@ffwll.ch>

For locking semantics it really doesn't matter when we grab the
ticket. But for lockdep validation it does: the acquire ctx is a fake
lockdep. Since other drivers might want to do a full multi-lock dance
in their fault-handler, not just lock a single dma_resv. Therefore we
must init the acquire_ctx only after we've done all the copy_*_user or
anything else that might trigger a pagefault. For msm this means we
need to move it past submit_lookup_objects.

Aside: Why is msm still using struct_mutex, it seems to be using
dma_resv_lock for general buffer state protection?

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Sean Paul <sean@poorly.run>
Cc: linux-arm-msm@vger.kernel.org
Cc: freedreno@lists.freedesktop.org
---
 drivers/gpu/drm/msm/msm_gem_submit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
index fb1fdd7fa3ef..126b2f62bfe7 100644
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -54,7 +54,6 @@ static struct msm_gem_submit *submit_create(struct drm_device *dev,
 
 	INIT_LIST_HEAD(&submit->node);
 	INIT_LIST_HEAD(&submit->bo_list);
-	ww_acquire_init(&submit->ticket, &reservation_ww_class);
 
 	return submit;
 }
@@ -489,6 +488,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
 	if (ret)
 		goto out;
 
+	ww_acquire_init(&submit->ticket, &reservation_ww_class);
 	ret = submit_lock_objects(submit);
 	if (ret)
 		goto out;
-- 
2.24.0

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

WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
	DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	linux-arm-msm@vger.kernel.org,
	Daniel Vetter <daniel.vetter@intel.com>,
	freedreno@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 3/3] drm/msm: Don't init ww_mutec acquire ctx before needed
Date: Tue, 19 Nov 2019 22:08:44 +0100	[thread overview]
Message-ID: <20191119210844.16947-4-daniel.vetter@ffwll.ch> (raw)
Message-ID: <20191119210844.1dblt0sHfPi2CDAagjjikCYaT3b19aHo771JCpv-f94@z> (raw)
In-Reply-To: <20191119210844.16947-1-daniel.vetter@ffwll.ch>

For locking semantics it really doesn't matter when we grab the
ticket. But for lockdep validation it does: the acquire ctx is a fake
lockdep. Since other drivers might want to do a full multi-lock dance
in their fault-handler, not just lock a single dma_resv. Therefore we
must init the acquire_ctx only after we've done all the copy_*_user or
anything else that might trigger a pagefault. For msm this means we
need to move it past submit_lookup_objects.

Aside: Why is msm still using struct_mutex, it seems to be using
dma_resv_lock for general buffer state protection?

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Sean Paul <sean@poorly.run>
Cc: linux-arm-msm@vger.kernel.org
Cc: freedreno@lists.freedesktop.org
---
 drivers/gpu/drm/msm/msm_gem_submit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
index fb1fdd7fa3ef..126b2f62bfe7 100644
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -54,7 +54,6 @@ static struct msm_gem_submit *submit_create(struct drm_device *dev,
 
 	INIT_LIST_HEAD(&submit->node);
 	INIT_LIST_HEAD(&submit->bo_list);
-	ww_acquire_init(&submit->ticket, &reservation_ww_class);
 
 	return submit;
 }
@@ -489,6 +488,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
 	if (ret)
 		goto out;
 
+	ww_acquire_init(&submit->ticket, &reservation_ww_class);
 	ret = submit_lock_objects(submit);
 	if (ret)
 		goto out;
-- 
2.24.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2019-11-19 21:08 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-19 21:08 [PATCH 0/3] more dma-buf lockdep priming Daniel Vetter
2019-11-19 21:08 ` [Intel-gfx] " Daniel Vetter
2019-11-19 21:08 ` Daniel Vetter
2019-11-19 21:08 ` [PATCH 1/3] drm/modeset: Prime modeset lock vs dma_resv Daniel Vetter
2019-11-19 21:08   ` [Intel-gfx] " Daniel Vetter
2019-11-20  8:34   ` Christian König
2019-11-20  8:34     ` [Intel-gfx] " Christian König
2019-11-20  8:34     ` Christian König
2019-11-20 10:55     ` Daniel Vetter
2019-11-20 10:55       ` [Intel-gfx] " Daniel Vetter
2019-11-19 21:08 ` [PATCH 2/3] dma-resv: Also prime acquire ctx for lockdep Daniel Vetter
2019-11-19 21:08   ` [Intel-gfx] " Daniel Vetter
2019-11-19 21:08   ` Daniel Vetter
2019-11-19 21:08   ` Daniel Vetter
2019-11-20 11:30   ` Christian König
2019-11-20 11:30     ` [Intel-gfx] " Christian König
2019-11-20 11:30     ` Christian König
2019-11-20 13:56     ` Maarten Lankhorst
2019-11-20 13:56       ` [Intel-gfx] " Maarten Lankhorst
2019-11-20 13:56       ` Maarten Lankhorst
2019-11-19 21:08 ` Daniel Vetter [this message]
2019-11-19 21:08   ` [Intel-gfx] [PATCH 3/3] drm/msm: Don't init ww_mutec acquire ctx before needed Daniel Vetter
2019-11-19 21:08   ` Daniel Vetter
2019-11-20  2:07   ` Rob Clark
2019-11-20  2:07     ` [Intel-gfx] " Rob Clark
2019-11-20  2:07     ` Rob Clark
2019-11-20  2:07     ` Rob Clark
2019-11-20 10:22     ` Daniel Vetter
2019-11-20 10:22       ` [Intel-gfx] " Daniel Vetter
2019-11-20 10:22       ` Daniel Vetter
2019-11-20 10:22       ` Daniel Vetter
2019-11-20 10:56   ` [PATCH] " Daniel Vetter
2019-11-20 10:56     ` [Intel-gfx] " Daniel Vetter
2019-11-20 10:56     ` Daniel Vetter
2019-11-21  0:24     ` Rob Clark
2019-11-21  0:24       ` [Intel-gfx] " Rob Clark
2019-11-21  0:24       ` Rob Clark
2019-11-21  0:24       ` Rob Clark
2019-11-21 10:03       ` Daniel Vetter
2019-11-21 10:03         ` [Intel-gfx] " Daniel Vetter
2019-11-21 10:03         ` Daniel Vetter
2019-11-19 22:31 ` ✗ Fi.CI.CHECKPATCH: warning for more dma-buf lockdep priming Patchwork
2019-11-19 22:31   ` [Intel-gfx] " Patchwork
2019-11-19 22:53 ` ✓ Fi.CI.BAT: success " Patchwork
2019-11-19 22:53   ` [Intel-gfx] " Patchwork
2019-11-20 13:55 ` ✓ Fi.CI.IGT: " Patchwork
2019-11-20 13:55   ` [Intel-gfx] " Patchwork
2019-11-20 15:31 ` ✗ Fi.CI.BUILD: failure for more dma-buf lockdep priming (rev2) Patchwork
2019-11-20 15:31   ` [Intel-gfx] " Patchwork

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=20191119210844.16947-4-daniel.vetter@ffwll.ch \
    --to=daniel.vetter@ffwll.ch \
    --cc=daniel.vetter@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=freedreno@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=robdclark@gmail.com \
    --cc=sean@poorly.run \
    /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.