From: Rob Clark <robdclark@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: freedreno@lists.freedesktop.org, linux-arm-msm@vger.kernel.org,
Rob Clark <robdclark@chromium.org>,
Rob Clark <robdclark@gmail.com>,
Abhinav Kumar <quic_abhinavk@quicinc.com>,
Dmitry Baryshkov <dmitry.baryshkov@linaro.org>,
Sean Paul <sean@poorly.run>, David Airlie <airlied@linux.ie>,
Daniel Vetter <daniel@ffwll.ch>,
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v2 01/13] drm/msm: Reorder lock vs submit alloc
Date: Tue, 19 Jul 2022 10:18:45 -0700 [thread overview]
Message-ID: <20220719171900.289265-2-robdclark@gmail.com> (raw)
In-Reply-To: <20220719171900.289265-1-robdclark@gmail.com>
From: Rob Clark <robdclark@chromium.org>
This lets us drop the NORETRY.
Signed-off-by: Rob Clark <robdclark@chromium.org>
---
drivers/gpu/drm/msm/msm_gem_submit.c | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/msm/msm_gem_submit.c b/drivers/gpu/drm/msm/msm_gem_submit.c
index c9e4aeb14f4a..b7c61a99d274 100644
--- a/drivers/gpu/drm/msm/msm_gem_submit.c
+++ b/drivers/gpu/drm/msm/msm_gem_submit.c
@@ -36,7 +36,7 @@ static struct msm_gem_submit *submit_create(struct drm_device *dev,
if (sz > SIZE_MAX)
return ERR_PTR(-ENOMEM);
- submit = kzalloc(sz, GFP_KERNEL | __GFP_NOWARN | __GFP_NORETRY);
+ submit = kzalloc(sz, GFP_KERNEL);
if (!submit)
return ERR_PTR(-ENOMEM);
@@ -771,25 +771,21 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
trace_msm_gpu_submit(pid_nr(pid), ring->id, submitid,
args->nr_bos, args->nr_cmds);
- ret = mutex_lock_interruptible(&queue->lock);
- if (ret)
- goto out_post_unlock;
-
if (args->flags & MSM_SUBMIT_FENCE_FD_OUT) {
out_fence_fd = get_unused_fd_flags(O_CLOEXEC);
if (out_fence_fd < 0) {
ret = out_fence_fd;
- goto out_unlock;
+ return ret;
}
}
- submit = submit_create(dev, gpu, queue, args->nr_bos,
- args->nr_cmds);
- if (IS_ERR(submit)) {
- ret = PTR_ERR(submit);
- submit = NULL;
- goto out_unlock;
- }
+ submit = submit_create(dev, gpu, queue, args->nr_bos, args->nr_cmds);
+ if (IS_ERR(submit))
+ return PTR_ERR(submit);
+
+ ret = mutex_lock_interruptible(&queue->lock);
+ if (ret)
+ goto out_post_unlock;
submit->pid = pid;
submit->ident = submitid;
@@ -965,9 +961,9 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data,
if (ret && (out_fence_fd >= 0))
put_unused_fd(out_fence_fd);
mutex_unlock(&queue->lock);
+out_post_unlock:
if (submit)
msm_gem_submit_put(submit);
-out_post_unlock:
if (!IS_ERR_OR_NULL(post_deps)) {
for (i = 0; i < args->nr_out_syncobjs; ++i) {
kfree(post_deps[i].chain);
--
2.36.1
next prev parent reply other threads:[~2022-07-19 17:18 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-19 17:18 [PATCH v2 00/13] drm+msm: Shrinker and LRU rework Rob Clark
2022-07-19 17:18 ` Rob Clark [this message]
2022-07-19 17:18 ` [PATCH v2 02/13] drm/msm: Small submit cleanup Rob Clark
2022-07-19 17:18 ` [PATCH v2 03/13] drm/msm: Split out idr_lock Rob Clark
2022-07-19 17:18 ` [PATCH v2 04/13] drm/msm/gem: Check for active in shrinker path Rob Clark
2022-07-19 17:18 ` [PATCH v2 05/13] drm/msm/gem: Rename update_inactive Rob Clark
2022-07-19 17:18 ` [PATCH v2 06/13] drm/msm/gem: Rename to pin/unpin_pages Rob Clark
2022-07-19 17:18 ` [PATCH v2 07/13] drm/msm/gem: Consolidate pin/unpin paths Rob Clark
2022-07-19 17:18 ` [PATCH v2 08/13] drm/msm/gem: Remove active refcnt Rob Clark
2022-07-19 17:18 ` [PATCH v2 09/13] drm/gem: Add LRU/shrinker helper Rob Clark
2022-07-19 18:56 ` Dmitry Osipenko
2022-07-20 17:57 ` Rob Clark
2022-07-19 17:18 ` [PATCH v2 10/13] drm/msm/gem: Convert to using drm_gem_lru Rob Clark
2022-07-19 17:18 ` [PATCH v2 11/13] drm/msm/gem: Unpin buffers earlier Rob Clark
2022-07-19 17:18 ` [PATCH v2 12/13] drm/msm/gem: Consolidate shrinker trace Rob Clark
2022-07-19 17:18 ` [PATCH v2 13/13] drm/msm/gem: Evict active GEM objects when necessary Rob Clark
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=20220719171900.289265-2-robdclark@gmail.com \
--to=robdclark@gmail.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dmitry.baryshkov@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=quic_abhinavk@quicinc.com \
--cc=robdclark@chromium.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).