drm/i915: Fix error checking/locking in perf/lookup_context()
Subsystems (2)
PATCH 1/2 drm/i915: Fix error checking/locking in perf/lookup_context()
1acfc104cdf8 missed to convert this one caller to be lockless. The side effect of that was that the error check in lookup_context() became incorrect. Convert now this caller too.
--- drivers/gpu/drm/i915/i915_perf.c | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-)
drivers/gpu/drm/i915/i915_perf.c +5 -27
@@ -2483,27 +2483,6 @@ static const struct file_operations fops = { }; -static struct i915_gem_context * -lookup_context (struct drm_i915_private *dev_priv, -struct drm_i915_file_private *file_priv, -u32 ctx_user_handle) -{ -struct i915_gem_context *ctx; -int ret; - - ret =i915_mutex_lock_interruptible (&dev_priv->drm); -if (ret) -return ERR_PTR (ret); - - ctx =i915_gem_context_lookup (file_priv, ctx_user_handle); -if (!IS_ERR (ctx)) -i915_gem_context_get (ctx); - -mutex_unlock (&dev_priv->drm.struct_mutex); - -return ctx; -} -/** * i915_perf_open_ioctl_locked - DRM ioctl() for userspace to open a stream FD * @dev_priv: i915 device instance
@@ -2545,12 +2524,11 @@ i915_perf_open_ioctl_locked(struct drm_i915_private *dev_priv,u32 ctx_handle = props->ctx_handle;struct drm_i915_file_private *file_priv = file->driver_priv; - specific_ctx =lookup_context (dev_priv, file_priv, ctx_handle); -if (IS_ERR (specific_ctx)) { - ret =PTR_ERR (specific_ctx); -if (ret != -EINTR ) -DRM_DEBUG ("Failed to look up context with ID %u for opening perf stream\n" , - ctx_handle); + specific_ctx =i915_gem_context_lookup (file_priv, ctx_handle); +if (!specific_ctx) { +DRM_DEBUG ("Failed to look up context with ID %u for opening perf stream\n" , + ctx_handle); + ret = -ENOENT ; goto err; } }
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: Fix user ptr check size in eb_relocate_vma()
Fix the sizeof(ptr) vs. sizeof(*ptr) typo.
--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem_execbuffer.c +1 -1
@@ -1459,7 +1459,7 @@ static int eb_relocate_vma(struct i915_execbuffer *eb, struct i915_vma *vma)* to read. However, if the array is not writable the user loses * the updated relocation values. */ -if (unlikely (!access_ok (VERIFY_READ , urelocs, remain*sizeof (urelocs)))) +if (unlikely (!access_ok (VERIFY_READ , urelocs, remain*sizeof (*urelocs))))return -EFAULT ; do {
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 2/2] drm/i915: Fix user ptr check size in eb_relocate_vma()
Quoting Imre Deak (2017-07-14 16:12:42)
Quoted 6 lines
Fix the sizeof(ptr) vs.
sizeof(*ptr)typo.Fixes 2889caa92321 - ("drm/i915: Eliminate lots of iterations over the execobjects array")Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Signed-off-by Imre Deak <[email protected]>
/o\ Oops.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Fix error checking/locking in perf/lookup_context()
In reply to Imre Deak== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Fix error checking/locking in perf/lookup_context()
URL : https://patchwork.freedesktop.org/series/27309/
State : success
== Summary ==
Series 27309v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/27309/revisions/1/mbox/
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-legacy:
pass -> FAIL (fi-snb-2600) fdo#100215
Test kms_flip:
Subgroup basic-flip-vs-modeset:
skip -> PASS (fi-skl-x1585l) fdo#101781
Test kms_pipe_crc_basic:
Subgroup hang-read-crc-pipe-a:
pass -> DMESG-WARN (fi-pnv-d510) fdo#101597fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fdo#101781 https://bugs.freedesktop.org/show_bug.cgi?id=101781
fdo#101597 https://bugs.freedesktop.org/show_bug.cgi?id=101597
fi-bdw-5557u total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:443s fi-bdw-gvtdvm total:279 pass:265 dwarn:0 dfail:0 fail:0 skip:14 time:431s fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:356s fi-bsw-n3050 total:279 pass:243 dwarn:0 dfail:0 fail:0 skip:36 time:526s fi-bxt-j4205 total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:507s fi-byt-j1900 total:279 pass:254 dwarn:1 dfail:0 fail:0 skip:24 time:494s fi-byt-n2820 total:279 pass:250 dwarn:1 dfail:0 fail:0 skip:28 time:487s fi-glk-2a total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:594s fi-hsw-4770 total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:436s fi-hsw-4770r total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:417s fi-ilk-650 total:279 pass:229 dwarn:0 dfail:0 fail:0 skip:50 time:418s fi-ivb-3520m total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:492s fi-ivb-3770 total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:467s fi-kbl-7500u total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:460s fi-kbl-7560u total:279 pass:268 dwarn:1 dfail:0 fail:0 skip:10 time:571s fi-kbl-r total:279 pass:260 dwarn:1 dfail:0 fail:0 skip:18 time:581s fi-pnv-d510 total:279 pass:221 dwarn:3 dfail:0 fail:0 skip:55 time:560s fi-skl-6260u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:476s fi-skl-6700hq total:279 pass:262 dwarn:0 dfail:0 fail:0 skip:17 time:592s fi-skl-6700k total:279 pass:257 dwarn:4 dfail:0 fail:0 skip:18 time:467s fi-skl-6770hq total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:473s fi-skl-gvtdvm total:279 pass:266 dwarn:0 dfail:0 fail:0 skip:13 time:442s fi-skl-x1585l total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:491s fi-snb-2520m total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:541s fi-snb-2600 total:279 pass:249 dwarn:0 dfail:0 fail:1 skip:29 time:412s
e1306e0d65a3a850838534019a9a61e73bf1efcc drm-tip: 2017y-07m-14d-13h-56m-32s UTC integration manifest 090da8a drm/i915: Fix user ptr check size in eb_relocate_vma()
84be7c7 drm/i915: Fix error checking/locking in perf/lookup_context()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_5190/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Chris Wilson
Reviewed-byRe: ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Fix error checking/locking in perf/lookup_context()
Quoting Patchwork (2017-07-14 16:28:47)
Quoted 3 lines
e1306e0d65a3a850838534019a9a61e73bf1efccdrm-tip: 2017y-07m-14d-13h-56m-32s UTC integration manifest 090da8a drm/i915: Fix user ptr check size ineb_relocate_vma()
84be7c7 drm/i915: Fix error checking/locking in perf/lookup_context()
And because pw saw it first,
lookup_context fix.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Fix error checking/locking in perf/lookup_context()
In reply to PatchworkQuoted 5 lines · Patchwork
== Series Details ==
Series: series starting with [1/2] drm/i915: Fix error checking/locking in perf/lookup_context()
URL : https://patchwork.freedesktop.org/series/27309/
State : success
I pushed both patches to -dinq, thanks for the review.
--Imre
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 52 lines · Imre Deak
1acfc104cdf8missed to convert this one caller to be lockless. The side effect of that was that the error check inlookup_context()became incorrect. Convert now this caller too.Fixes 1acfc104cdf ("drm/i915: Enable rcu-only context lookups")Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Signed-off-by Imre Deak <[email protected]>--- drivers/gpu/drm/i915/i915_perf.c | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-)drivers/gpu/drm/i915/i915_perf.c +0
-25@@ -2483,27 +2483,6 @@ static const struct file_operations fops = { }; -static struct i915_gem_context * -lookup_context (struct drm_i915_private *dev_priv, -struct drm_i915_file_private *file_priv, -u32 ctx_user_handle) -{ -struct i915_gem_context *ctx; -int ret; - - ret =i915_mutex_lock_interruptible (&dev_priv->drm); -if (ret) -return ERR_PTR (ret); - - ctx =i915_gem_context_lookup (file_priv, ctx_user_handle); -if (!IS_ERR (ctx)) -i915_gem_context_get (ctx); - -mutex_unlock (&dev_priv->drm.struct_mutex); - -return ctx; -} -/** * i915_perf_open_ioctl_locked - DRM ioctl() for userspace to open a stream FD * @dev_priv: i915 device instance @@ -2545,12 +2524,11 @@ i915_perf_open_ioctl_locked(struct drm_i915_private *dev_priv,u32 ctx_handle = props->ctx_handle;struct drm_i915_file_private *file_priv = file->driver_priv; - specific_ctx =lookup_context (dev_priv, file_priv, ctx_handle); -if (IS_ERR (specific_ctx)) { - ret =PTR_ERR (specific_ctx); -if (ret != -EINTR )
drivers/gpu/drm/i915/i915_perf.c i915_perf_open_ioctl_locked(struct drm_i915_private *dev_priv, · line 2534
Quoted 10 lines
drivers/gpu/drm/i915/i915_perf.c +5
-2-DRM_DEBUG ("Failed to look up context with ID %u for opening perf stream\n" , - ctx_handle); + specific_ctx =i915_gem_context_lookup (file_priv, ctx_handle); +if (!specific_ctx) { +DRM_DEBUG ("Failed to look up context with ID %u for opening perf stream\n" , + ctx_handle); + ret = -ENOENT ; goto err; } }
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx