Skip to contentSkip to conversation

drm/i915/selftests: fix error handling in __live_lrc_indirect_ctx_bb()

PATCH In review Dan Carpenter 4 participants 5 messages Apr 29, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915/selftests: fix error handling in __live_lrc_indirect_ctx_bb()

If intel_context_create() fails then it leads to an error pointer dereference. I shuffled things around to make error handling easier.

Fixes 1dd47b54baea ("drm/i915: Add live selftests for indirect ctx batchbuffers")
---
 drivers/gpu/drm/i915/gt/selftest_lrc.c | 30 +++++++++++++++-----------
 1 file changed, 18 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/gt/selftest_lrc.c +18 -12
index d3fa91aed7dee..c4bfad5c49dea 100644
@@ -5795,26 +5795,29 @@ static int indirect_ctx_bb_check(struct intel_context *ce)
 static int __live_lrc_indirect_ctx_bb(struct intel_engine_cs *engine)
 {
 	struct intel_context *a, *b;
-	int err = 0;
+	int err;
 
 	a = intel_context_create(engine);
-	b = intel_context_create(engine);
-
+	if (IS_ERR(a))
+		return PTR_ERR(a);
 	err = intel_context_pin(a);
 	if (err)
-		return err;
+		goto put_a;
 
-	err = intel_context_pin(b);
-	if (err) {
-		intel_context_put(a);
-		return err;
+	b = intel_context_create(engine);
+	if (IS_ERR(b)) {
+		err = PTR_ERR(b);
+		goto unpin_a;
 	}
+	err = intel_context_pin(b);
+	if (err)
+		goto put_b;
 
 	/* We use the already reserved extra page in context state */
 	if (!a->wa_bb_page) {
 		GEM_BUG_ON(b->wa_bb_page);
 		GEM_BUG_ON(INTEL_GEN(engine->i915) = 12);
-		goto out;
+		goto unpin_b;
 	}
 
 	/*
@@ -5829,14 +5832,17 @@ static int __live_lrc_indirect_ctx_bb(struct intel_engine_cs *engine)
 
 	err = indirect_ctx_bb_check(a);
 	if (err)
-		goto out;
+		goto unpin_b;
 
 	err = indirect_ctx_bb_check(b);
-out:
+
+unpin_b:
 	intel_context_unpin(b);
+put_b:
 	intel_context_put(b);
-
+unpin_a:
 	intel_context_unpin(a);
+put_a:
 	intel_context_put(a);
 
 	return err;
Signature · 1 line
2.26.2
Reviewed-by on v1 1/1
#1 lore raw

Quoting Dan Carpenter (2020-04-29 14:24:25)

Quoted 61 lines

If intel_context_create() fails then it leads to an error pointer dereference. I shuffled things around to make error handling easier.

Fixes 1dd47b54baea ("drm/i915: Add live selftests for indirect ctx batchbuffers")
---
 drivers/gpu/drm/i915/gt/selftest_lrc.c | 30 +++++++++++++++-----------
 1 file changed, 18 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/gt/selftest_lrc.c +13 -11
index d3fa91aed7dee..c4bfad5c49dea 100644
@@ -5795,26 +5795,29 @@ static int indirect_ctx_bb_check(struct intel_context *ce)
 static int __live_lrc_indirect_ctx_bb(struct intel_engine_cs *engine)
 {
        struct intel_context *a, *b;
-       int err = 0;
+       int err;
 
        a = intel_context_create(engine);
-       b = intel_context_create(engine);
-
+       if (IS_ERR(a))
+               return PTR_ERR(a);
        err = intel_context_pin(a);
        if (err)
-               return err;
+               goto put_a;
 
-       err = intel_context_pin(b);
-       if (err) {
-               intel_context_put(a);
-               return err;
+       b = intel_context_create(engine);
+       if (IS_ERR(b)) {
+               err = PTR_ERR(b);
+               goto unpin_a;
        }
+       err = intel_context_pin(b);
+       if (err)
+               goto put_b;
 
        /* We use the already reserved extra page in context state */
        if (!a->wa_bb_page) {
                GEM_BUG_ON(b->wa_bb_page);
                GEM_BUG_ON(INTEL_GEN(engine->i915) = 12);
-               goto out;
+               goto unpin_b;
        }
 
        /*
@@ -5829,14 +5832,17 @@ static int __live_lrc_indirect_ctx_bb(struct intel_engine_cs *engine)
 
        err = indirect_ctx_bb_check(a);
        if (err)
-               goto out;
+               goto unpin_b;
 
        err = indirect_ctx_bb_check(b);
-out:

drivers/gpu/drm/i915/gt/selftest_lrc.c static int __live_lrc_indirect_ctx_bb(struct intel_engine_cs *engine) · line 5846

Quoted 10 lines
drivers/gpu/drm/i915/gt/selftest_lrc.c +5 -1
+
+unpin_b:
        intel_context_unpin(b);
+put_b:
        intel_context_put(b);
-
+unpin_a:
        intel_context_unpin(a);
+put_a:
        intel_context_put(a);

Onion looks correct, and there should not be any issue with this sequence of create/pin.

-Chris

#3 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/selftests: fix error handling in __live_lrc_indirect_ctx_bb()

In reply to Dan Carpenter
== Series Details ==

== Series Details ==

Series: drm/i915/selftests: fix error handling in __live_lrc_indirect_ctx_bb()
URL : https://patchwork.freedesktop.org/series/76727/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_8391 -> Patchwork_17514
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/index.html

Known issues
------------

Here are the changes found in Patchwork_17514 that come from known issues:

### IGT changes ###

#### Possible fixes ####

* igt@i915_pm_rpm@module-reload:
- fi-skl-guc: [INCOMPLETE][1] ([i915#151]) -> [PASS][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/fi-skl-guc/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/fi-skl-guc/igt@[email protected]

#### Warnings ####

* igt@i915_pm_rpm@module-reload:
- fi-kbl-x1275: [SKIP][3] ([fdo#109271]) -> [FAIL][4] ([i915#62])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/fi-kbl-x1275/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/fi-kbl-x1275/igt@[email protected]

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#151]: https://gitlab.freedesktop.org/drm/intel/issues/151
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62

Participating hosts (48 -> 41)
------------------------------

Missing (7): fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-kbl-7500u fi-ctg-p8600 fi-kbl-7560u fi-byt-clapper

Build changes
-------------

* CI: CI-20190529 -> None
* Linux: CI_DRM_8391 -> Patchwork_17514

CI-20190529: 20190529
CI_DRM_8391: 9cada6f702d618458eb6dda220f5cfefe655f475 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5614: d095827add11d4e8158b87683971ee659749d9a4 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17514: 5500fe83d497795edc05add948e67256091c872e @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

5500fe83d497 drm/i915/selftests: fix error handling in __live_lrc_indirect_ctx_bb()

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/selftests: fix error handling in __live_lrc_indirect_ctx_bb()

In reply to Dan Carpenter
== Series Details ==

== Series Details ==

Series: drm/i915/selftests: fix error handling in __live_lrc_indirect_ctx_bb()
URL : https://patchwork.freedesktop.org/series/76727/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_8391_full -> Patchwork_17514_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

Known issues
------------

Here are the changes found in Patchwork_17514_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-ytiled:
- shard-glk: [PASS][1] -> [FAIL][2] ([i915#52] / [i915#54])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-glk5/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-glk6/igt@[email protected]

* igt@kms_flip_tiling@flip-changes-tiling-y:
- shard-kbl: [PASS][3] -> [FAIL][4] ([i915#699] / [i915#93] / [i915#95])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-kbl7/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-kbl4/igt@[email protected]

* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-skl: [PASS][5] -> [INCOMPLETE][6] ([i915#69]) +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-skl8/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-skl2/igt@[email protected]
- shard-kbl: [PASS][7] -> [DMESG-WARN][8] ([i915#180])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-kbl1/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-kbl2/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [PASS][9] -> [FAIL][10] ([fdo#108145] / [i915#265])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-skl2/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-skl10/igt@[email protected]

* igt@kms_psr2_su@frontbuffer:
- shard-iclb: [PASS][11] -> [SKIP][12] ([fdo#109642] / [fdo#111068])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-iclb2/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-iclb3/igt@[email protected]

* igt@kms_psr@psr2_suspend:
- shard-iclb: [PASS][13] -> [SKIP][14] ([fdo#109441]) +3 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-iclb2/igt@kms_psr@psr2_suspend.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-iclb3/igt@kms_psr@psr2_suspend.html

* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-apl: [PASS][15] -> [DMESG-WARN][16] ([i915#180]) +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-apl3/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-apl6/igt@[email protected]

#### Possible fixes ####

* {igt@gem_ctx_isolation@preservation-s3@rcs0}:
- shard-apl: [DMESG-WARN][17] ([i915#180]) -> [PASS][18] +5 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-apl6/igt@gem_ctx_isolation@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-apl1/igt@gem_ctx_isolation@[email protected]

* igt@gem_workarounds@suspend-resume-fd:
- shard-skl: [INCOMPLETE][19] ([i915#69]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-skl4/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-skl9/igt@[email protected]

* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [SKIP][21] ([fdo#109349]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-iclb6/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-iclb2/igt@[email protected]

* igt@kms_draw_crc@draw-method-rgb565-mmap-wc-xtiled:
- shard-skl: [FAIL][23] ([i915#52] / [i915#54]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-skl5/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-skl1/igt@[email protected]

* igt@kms_draw_crc@draw-method-rgb565-pwrite-untiled:
- shard-glk: [FAIL][25] ([i915#177] / [i915#52] / [i915#54]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-glk9/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-glk9/igt@[email protected]

* {igt@kms_flip@2x-plain-flip-fb-recreate-interruptible@bc-hdmi-a1-hdmi-a2}:
- shard-glk: [FAIL][27] ([i915#34]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-glk2/igt@kms_flip@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-glk7/igt@kms_flip@[email protected]

* {igt@kms_flip@flip-vs-expired-vblank-interruptible@c-edp1}:
- shard-skl: [FAIL][29] ([i915#79]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-skl5/igt@kms_flip@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-skl9/igt@kms_flip@[email protected]

* {igt@kms_flip@flip-vs-suspend@c-edp1}:
- shard-skl: [INCOMPLETE][31] ([i915#198]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-skl3/igt@kms_flip@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-skl2/igt@kms_flip@[email protected]

* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-move:
- shard-skl: [FAIL][33] ([i915#49]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-skl5/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-skl1/igt@[email protected]

* igt@kms_hdr@bpc-switch:
- shard-skl: [FAIL][35] ([i915#1188]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-skl2/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-skl8/igt@[email protected]

* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- shard-kbl: [DMESG-WARN][37] ([i915#180]) -> [PASS][38] +3 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-kbl7/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-kbl4/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [FAIL][39] ([fdo#108145] / [i915#265]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-skl5/igt@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-skl1/igt@[email protected]

* igt@kms_psr@psr2_cursor_plane_move:
- shard-iclb: [SKIP][41] ([fdo#109441]) -> [PASS][42] +2 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-iclb3/igt@kms_psr@psr2_cursor_plane_move.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-iclb2/igt@kms_psr@psr2_cursor_plane_move.html

* igt@kms_setmode@basic:
- shard-apl: [FAIL][43] ([i915#31]) -> [PASS][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-apl8/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-apl4/igt@[email protected]

* {igt@perf@blocking-parameterized}:
- shard-iclb: [FAIL][45] ([i915#1542]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-iclb5/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-iclb5/igt@[email protected]

#### Warnings ####

* igt@kms_psr2_su@page_flip:
- shard-iclb: [FAIL][47] ([i915#608]) -> [SKIP][48] ([fdo#109642] / [fdo#111068])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_8391/shard-iclb2/igt@kms_psr2_su@page_flip.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/shard-iclb5/igt@kms_psr2_su@page_flip.html

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1542]: https://gitlab.freedesktop.org/drm/intel/issues/1542
[i915#177]: https://gitlab.freedesktop.org/drm/intel/issues/177
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#31]: https://gitlab.freedesktop.org/drm/intel/issues/31
[i915#34]: https://gitlab.freedesktop.org/drm/intel/issues/34
[i915#49]: https://gitlab.freedesktop.org/drm/intel/issues/49
[i915#52]: https://gitlab.freedesktop.org/drm/intel/issues/52
[i915#54]: https://gitlab.freedesktop.org/drm/intel/issues/54
[i915#608]: https://gitlab.freedesktop.org/drm/intel/issues/608
[i915#69]: https://gitlab.freedesktop.org/drm/intel/issues/69
[i915#699]: https://gitlab.freedesktop.org/drm/intel/issues/699
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#93]: https://gitlab.freedesktop.org/drm/intel/issues/93
[i915#95]: https://gitlab.freedesktop.org/drm/intel/issues/95

Participating hosts (10 -> 10)
------------------------------

No changes in participating hosts

Build changes
-------------

* CI: CI-20190529 -> None
* Linux: CI_DRM_8391 -> Patchwork_17514

CI-20190529: 20190529
CI_DRM_8391: 9cada6f702d618458eb6dda220f5cfefe655f475 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5614: d095827add11d4e8158b87683971ee659749d9a4 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_17514: 5500fe83d497795edc05add948e67256091c872e @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_17514/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx