* [PATCH v2] drm/i915/selftests: Unwind hugepages to drop wakeref on error
@ 2023-01-17 12:32 ` Nirmoy Das
0 siblings, 0 replies; 10+ messages in thread
From: Nirmoy Das @ 2023-01-17 12:32 UTC (permalink / raw)
To: intel-gfx
Cc: Andi Shyti, dri-devel, Matthew Auld, Andrzej Hajda,
chris.p.wilson, Nirmoy Das
From: Chris Wilson <chris.p.wilson@linux.intel.com>
Make sure that upon error after we have acquired the wakeref we do
release it again.
v2: add another missing "goto out_wf"(Andi).
Fixes: 027c38b4121e ("drm/i915/selftests: Grab the runtime pm in shrink_thp")
Cc: Andi Shyti <andi.shyti@linux.intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Signed-off-by: Chris Wilson <chris.p.wilson@linux.intel.com>
Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
---
drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
index c281b0ec9e05..defece0bcb81 100644
--- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
+++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
@@ -1855,7 +1855,7 @@ static int igt_shrink_thp(void *arg)
I915_SHRINK_ACTIVE);
i915_vma_unpin(vma);
if (err)
- goto out_put;
+ goto out_wf;
/*
* Now that the pages are *unpinned* shrinking should invoke
@@ -1871,19 +1871,19 @@ static int igt_shrink_thp(void *arg)
pr_err("unexpected pages mismatch, should_swap=%s\n",
str_yes_no(should_swap));
err = -EINVAL;
- goto out_put;
+ goto out_wf;
}
if (should_swap == (obj->mm.page_sizes.sg || obj->mm.page_sizes.phys)) {
pr_err("unexpected residual page-size bits, should_swap=%s\n",
str_yes_no(should_swap));
err = -EINVAL;
- goto out_put;
+ goto out_wf;
}
err = i915_vma_pin(vma, 0, 0, flags);
if (err)
- goto out_put;
+ goto out_wf;
while (n--) {
err = cpu_check(obj, n, 0xdeadbeaf);
--
2.39.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Intel-gfx] [PATCH v2] drm/i915/selftests: Unwind hugepages to drop wakeref on error
@ 2023-01-17 12:32 ` Nirmoy Das
0 siblings, 0 replies; 10+ messages in thread
From: Nirmoy Das @ 2023-01-17 12:32 UTC (permalink / raw)
To: intel-gfx
Cc: dri-devel, Matthew Auld, Andrzej Hajda, chris.p.wilson, Nirmoy Das
From: Chris Wilson <chris.p.wilson@linux.intel.com>
Make sure that upon error after we have acquired the wakeref we do
release it again.
v2: add another missing "goto out_wf"(Andi).
Fixes: 027c38b4121e ("drm/i915/selftests: Grab the runtime pm in shrink_thp")
Cc: Andi Shyti <andi.shyti@linux.intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Signed-off-by: Chris Wilson <chris.p.wilson@linux.intel.com>
Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
---
drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
index c281b0ec9e05..defece0bcb81 100644
--- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
+++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
@@ -1855,7 +1855,7 @@ static int igt_shrink_thp(void *arg)
I915_SHRINK_ACTIVE);
i915_vma_unpin(vma);
if (err)
- goto out_put;
+ goto out_wf;
/*
* Now that the pages are *unpinned* shrinking should invoke
@@ -1871,19 +1871,19 @@ static int igt_shrink_thp(void *arg)
pr_err("unexpected pages mismatch, should_swap=%s\n",
str_yes_no(should_swap));
err = -EINVAL;
- goto out_put;
+ goto out_wf;
}
if (should_swap == (obj->mm.page_sizes.sg || obj->mm.page_sizes.phys)) {
pr_err("unexpected residual page-size bits, should_swap=%s\n",
str_yes_no(should_swap));
err = -EINVAL;
- goto out_put;
+ goto out_wf;
}
err = i915_vma_pin(vma, 0, 0, flags);
if (err)
- goto out_put;
+ goto out_wf;
while (n--) {
err = cpu_check(obj, n, 0xdeadbeaf);
--
2.39.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v2] drm/i915/selftests: Unwind hugepages to drop wakeref on error
2023-01-17 12:32 ` [Intel-gfx] " Nirmoy Das
@ 2023-01-17 13:57 ` Andi Shyti
-1 siblings, 0 replies; 10+ messages in thread
From: Andi Shyti @ 2023-01-17 13:57 UTC (permalink / raw)
To: Nirmoy Das
Cc: Andi Shyti, intel-gfx, dri-devel, Matthew Auld, Andrzej Hajda,
chris.p.wilson
Hi Nirmoy,
On Tue, Jan 17, 2023 at 01:32:34PM +0100, Nirmoy Das wrote:
> From: Chris Wilson <chris.p.wilson@linux.intel.com>
>
> Make sure that upon error after we have acquired the wakeref we do
> release it again.
>
> v2: add another missing "goto out_wf"(Andi).
>
> Fixes: 027c38b4121e ("drm/i915/selftests: Grab the runtime pm in shrink_thp")
> Cc: Andi Shyti <andi.shyti@linux.intel.com>
> Reviewed-by: Matthew Auld <matthew.auld@intel.com>
> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
> Signed-off-by: Chris Wilson <chris.p.wilson@linux.intel.com>
> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Thanks,
Andi
> ---
> drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> index c281b0ec9e05..defece0bcb81 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> @@ -1855,7 +1855,7 @@ static int igt_shrink_thp(void *arg)
> I915_SHRINK_ACTIVE);
> i915_vma_unpin(vma);
> if (err)
> - goto out_put;
> + goto out_wf;
>
> /*
> * Now that the pages are *unpinned* shrinking should invoke
> @@ -1871,19 +1871,19 @@ static int igt_shrink_thp(void *arg)
> pr_err("unexpected pages mismatch, should_swap=%s\n",
> str_yes_no(should_swap));
> err = -EINVAL;
> - goto out_put;
> + goto out_wf;
> }
>
> if (should_swap == (obj->mm.page_sizes.sg || obj->mm.page_sizes.phys)) {
> pr_err("unexpected residual page-size bits, should_swap=%s\n",
> str_yes_no(should_swap));
> err = -EINVAL;
> - goto out_put;
> + goto out_wf;
> }
>
> err = i915_vma_pin(vma, 0, 0, flags);
> if (err)
> - goto out_put;
> + goto out_wf;
>
> while (n--) {
> err = cpu_check(obj, n, 0xdeadbeaf);
> --
> 2.39.0
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH v2] drm/i915/selftests: Unwind hugepages to drop wakeref on error
@ 2023-01-17 13:57 ` Andi Shyti
0 siblings, 0 replies; 10+ messages in thread
From: Andi Shyti @ 2023-01-17 13:57 UTC (permalink / raw)
To: Nirmoy Das
Cc: intel-gfx, dri-devel, Matthew Auld, Andrzej Hajda, chris.p.wilson
Hi Nirmoy,
On Tue, Jan 17, 2023 at 01:32:34PM +0100, Nirmoy Das wrote:
> From: Chris Wilson <chris.p.wilson@linux.intel.com>
>
> Make sure that upon error after we have acquired the wakeref we do
> release it again.
>
> v2: add another missing "goto out_wf"(Andi).
>
> Fixes: 027c38b4121e ("drm/i915/selftests: Grab the runtime pm in shrink_thp")
> Cc: Andi Shyti <andi.shyti@linux.intel.com>
> Reviewed-by: Matthew Auld <matthew.auld@intel.com>
> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
> Signed-off-by: Chris Wilson <chris.p.wilson@linux.intel.com>
> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Thanks,
Andi
> ---
> drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> index c281b0ec9e05..defece0bcb81 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> @@ -1855,7 +1855,7 @@ static int igt_shrink_thp(void *arg)
> I915_SHRINK_ACTIVE);
> i915_vma_unpin(vma);
> if (err)
> - goto out_put;
> + goto out_wf;
>
> /*
> * Now that the pages are *unpinned* shrinking should invoke
> @@ -1871,19 +1871,19 @@ static int igt_shrink_thp(void *arg)
> pr_err("unexpected pages mismatch, should_swap=%s\n",
> str_yes_no(should_swap));
> err = -EINVAL;
> - goto out_put;
> + goto out_wf;
> }
>
> if (should_swap == (obj->mm.page_sizes.sg || obj->mm.page_sizes.phys)) {
> pr_err("unexpected residual page-size bits, should_swap=%s\n",
> str_yes_no(should_swap));
> err = -EINVAL;
> - goto out_put;
> + goto out_wf;
> }
>
> err = i915_vma_pin(vma, 0, 0, flags);
> if (err)
> - goto out_put;
> + goto out_wf;
>
> while (n--) {
> err = cpu_check(obj, n, 0xdeadbeaf);
> --
> 2.39.0
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/selftests: Unwind hugepages to drop wakeref on error (rev3)
2023-01-17 12:32 ` [Intel-gfx] " Nirmoy Das
(?)
(?)
@ 2023-01-17 14:24 ` Patchwork
-1 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2023-01-17 14:24 UTC (permalink / raw)
To: Nirmoy Das; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 7905 bytes --]
== Series Details ==
Series: drm/i915/selftests: Unwind hugepages to drop wakeref on error (rev3)
URL : https://patchwork.freedesktop.org/series/112801/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12590 -> Patchwork_112801v3
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/index.html
Participating hosts (42 -> 43)
------------------------------
Additional (2): fi-bsw-kefka fi-rkl-11600
Missing (1): fi-snb-2520m
New tests
---------
New tests have been introduced between CI_DRM_12590 and Patchwork_112801v3:
### New IGT tests (1) ###
* igt@gem_softpin@safe-alignment:
- Statuses : 42 pass(s)
- Exec time: [0.0] s
Known issues
------------
Here are the changes found in Patchwork_112801v3 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@debugfs_test@basic-hwmon:
- fi-rkl-11600: NOTRUN -> [SKIP][1] ([i915#7456])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/fi-rkl-11600/igt@debugfs_test@basic-hwmon.html
* igt@gem_huc_copy@huc-copy:
- fi-rkl-11600: NOTRUN -> [SKIP][2] ([i915#2190])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/fi-rkl-11600/igt@gem_huc_copy@huc-copy.html
* igt@gem_lmem_swapping@basic:
- fi-rkl-11600: NOTRUN -> [SKIP][3] ([i915#4613]) +3 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/fi-rkl-11600/igt@gem_lmem_swapping@basic.html
* igt@gem_tiled_pread_basic:
- fi-rkl-11600: NOTRUN -> [SKIP][4] ([i915#3282])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/fi-rkl-11600/igt@gem_tiled_pread_basic.html
* igt@i915_pm_backlight@basic-brightness:
- fi-rkl-11600: NOTRUN -> [SKIP][5] ([i915#7561])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/fi-rkl-11600/igt@i915_pm_backlight@basic-brightness.html
* igt@i915_suspend@basic-s3-without-i915:
- fi-rkl-11600: NOTRUN -> [INCOMPLETE][6] ([i915#4817])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/fi-rkl-11600/igt@i915_suspend@basic-s3-without-i915.html
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- bat-dg1-6: NOTRUN -> [SKIP][7] ([i915#7828])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/bat-dg1-6/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
* igt@kms_chamelium_hpd@dp-hpd-fast:
- fi-rkl-11600: NOTRUN -> [SKIP][8] ([i915#7828]) +7 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/fi-rkl-11600/igt@kms_chamelium_hpd@dp-hpd-fast.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor:
- fi-rkl-11600: NOTRUN -> [SKIP][9] ([i915#4103])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/fi-rkl-11600/igt@kms_cursor_legacy@basic-busy-flip-before-cursor.html
* igt@kms_force_connector_basic@force-load-detect:
- fi-rkl-11600: NOTRUN -> [SKIP][10] ([fdo#109285] / [i915#4098])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/fi-rkl-11600/igt@kms_force_connector_basic@force-load-detect.html
* igt@kms_psr@primary_page_flip:
- fi-rkl-11600: NOTRUN -> [SKIP][11] ([i915#1072]) +3 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/fi-rkl-11600/igt@kms_psr@primary_page_flip.html
* igt@kms_setmode@basic-clone-single-crtc:
- fi-rkl-11600: NOTRUN -> [SKIP][12] ([i915#3555] / [i915#4098])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/fi-rkl-11600/igt@kms_setmode@basic-clone-single-crtc.html
* igt@prime_vgem@basic-fence-flip:
- fi-bsw-kefka: NOTRUN -> [SKIP][13] ([fdo#109271]) +26 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/fi-bsw-kefka/igt@prime_vgem@basic-fence-flip.html
* igt@prime_vgem@basic-read:
- fi-rkl-11600: NOTRUN -> [SKIP][14] ([fdo#109295] / [i915#3291] / [i915#3708]) +2 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/fi-rkl-11600/igt@prime_vgem@basic-read.html
* igt@prime_vgem@basic-userptr:
- fi-rkl-11600: NOTRUN -> [SKIP][15] ([fdo#109295] / [i915#3301] / [i915#3708])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/fi-rkl-11600/igt@prime_vgem@basic-userptr.html
#### Possible fixes ####
* igt@gem_exec_gttfill@basic:
- fi-pnv-d510: [FAIL][16] ([i915#7229]) -> [PASS][17]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/fi-pnv-d510/igt@gem_exec_gttfill@basic.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/fi-pnv-d510/igt@gem_exec_gttfill@basic.html
* igt@i915_selftest@live@hangcheck:
- bat-dg1-6: [INCOMPLETE][18] ([i915#4983]) -> [PASS][19]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/bat-dg1-6/igt@i915_selftest@live@hangcheck.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/bat-dg1-6/igt@i915_selftest@live@hangcheck.html
* igt@i915_selftest@live@reset:
- {bat-rpls-1}: [DMESG-FAIL][20] ([i915#4983]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/bat-rpls-1/igt@i915_selftest@live@reset.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/bat-rpls-1/igt@i915_selftest@live@reset.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4817]: https://gitlab.freedesktop.org/drm/intel/issues/4817
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#7229]: https://gitlab.freedesktop.org/drm/intel/issues/7229
[i915#7359]: https://gitlab.freedesktop.org/drm/intel/issues/7359
[i915#7456]: https://gitlab.freedesktop.org/drm/intel/issues/7456
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7625]: https://gitlab.freedesktop.org/drm/intel/issues/7625
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
Build changes
-------------
* Linux: CI_DRM_12590 -> Patchwork_112801v3
CI-20190529: 20190529
CI_DRM_12590: aa9844e5dcac30f3b7c09fa0218516692698f0e2 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7121: aa16e81259f59734230d441905b9d0f605e4a4b5 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_112801v3: aa9844e5dcac30f3b7c09fa0218516692698f0e2 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
82d26f59df62 drm/i915/selftests: Unwind hugepages to drop wakeref on error
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/index.html
[-- Attachment #2: Type: text/html, Size: 8993 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2] drm/i915/selftests: Unwind hugepages to drop wakeref on error
2023-01-17 12:32 ` [Intel-gfx] " Nirmoy Das
@ 2023-01-17 16:05 ` Das, Nirmoy
-1 siblings, 0 replies; 10+ messages in thread
From: Das, Nirmoy @ 2023-01-17 16:05 UTC (permalink / raw)
To: Nirmoy Das, intel-gfx
Cc: Andrzej Hajda, chris.p.wilson, dri-devel, Andi Shyti, Matthew Auld
[-- Attachment #1: Type: text/plain, Size: 1913 bytes --]
|Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>|
On 1/17/2023 1:32 PM, Nirmoy Das wrote:
> From: Chris Wilson<chris.p.wilson@linux.intel.com>
>
> Make sure that upon error after we have acquired the wakeref we do
> release it again.
>
> v2: add another missing "goto out_wf"(Andi).
>
> Fixes: 027c38b4121e ("drm/i915/selftests: Grab the runtime pm in shrink_thp")
> Cc: Andi Shyti<andi.shyti@linux.intel.com>
> Reviewed-by: Matthew Auld<matthew.auld@intel.com>
> Reviewed-by: Andrzej Hajda<andrzej.hajda@intel.com>
> Signed-off-by: Chris Wilson<chris.p.wilson@linux.intel.com>
> Signed-off-by: Nirmoy Das<nirmoy.das@intel.com>
> ---
> drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> index c281b0ec9e05..defece0bcb81 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> @@ -1855,7 +1855,7 @@ static int igt_shrink_thp(void *arg)
> I915_SHRINK_ACTIVE);
> i915_vma_unpin(vma);
> if (err)
> - goto out_put;
> + goto out_wf;
>
> /*
> * Now that the pages are *unpinned* shrinking should invoke
> @@ -1871,19 +1871,19 @@ static int igt_shrink_thp(void *arg)
> pr_err("unexpected pages mismatch, should_swap=%s\n",
> str_yes_no(should_swap));
> err = -EINVAL;
> - goto out_put;
> + goto out_wf;
> }
>
> if (should_swap == (obj->mm.page_sizes.sg || obj->mm.page_sizes.phys)) {
> pr_err("unexpected residual page-size bits, should_swap=%s\n",
> str_yes_no(should_swap));
> err = -EINVAL;
> - goto out_put;
> + goto out_wf;
> }
>
> err = i915_vma_pin(vma, 0, 0, flags);
> if (err)
> - goto out_put;
> + goto out_wf;
>
> while (n--) {
> err = cpu_check(obj, n, 0xdeadbeaf);
[-- Attachment #2: Type: text/html, Size: 2840 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH v2] drm/i915/selftests: Unwind hugepages to drop wakeref on error
@ 2023-01-17 16:05 ` Das, Nirmoy
0 siblings, 0 replies; 10+ messages in thread
From: Das, Nirmoy @ 2023-01-17 16:05 UTC (permalink / raw)
To: Nirmoy Das, intel-gfx
Cc: Andrzej Hajda, chris.p.wilson, dri-devel, Matthew Auld
[-- Attachment #1: Type: text/plain, Size: 1913 bytes --]
|Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>|
On 1/17/2023 1:32 PM, Nirmoy Das wrote:
> From: Chris Wilson<chris.p.wilson@linux.intel.com>
>
> Make sure that upon error after we have acquired the wakeref we do
> release it again.
>
> v2: add another missing "goto out_wf"(Andi).
>
> Fixes: 027c38b4121e ("drm/i915/selftests: Grab the runtime pm in shrink_thp")
> Cc: Andi Shyti<andi.shyti@linux.intel.com>
> Reviewed-by: Matthew Auld<matthew.auld@intel.com>
> Reviewed-by: Andrzej Hajda<andrzej.hajda@intel.com>
> Signed-off-by: Chris Wilson<chris.p.wilson@linux.intel.com>
> Signed-off-by: Nirmoy Das<nirmoy.das@intel.com>
> ---
> drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> index c281b0ec9e05..defece0bcb81 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> @@ -1855,7 +1855,7 @@ static int igt_shrink_thp(void *arg)
> I915_SHRINK_ACTIVE);
> i915_vma_unpin(vma);
> if (err)
> - goto out_put;
> + goto out_wf;
>
> /*
> * Now that the pages are *unpinned* shrinking should invoke
> @@ -1871,19 +1871,19 @@ static int igt_shrink_thp(void *arg)
> pr_err("unexpected pages mismatch, should_swap=%s\n",
> str_yes_no(should_swap));
> err = -EINVAL;
> - goto out_put;
> + goto out_wf;
> }
>
> if (should_swap == (obj->mm.page_sizes.sg || obj->mm.page_sizes.phys)) {
> pr_err("unexpected residual page-size bits, should_swap=%s\n",
> str_yes_no(should_swap));
> err = -EINVAL;
> - goto out_put;
> + goto out_wf;
> }
>
> err = i915_vma_pin(vma, 0, 0, flags);
> if (err)
> - goto out_put;
> + goto out_wf;
>
> while (n--) {
> err = cpu_check(obj, n, 0xdeadbeaf);
[-- Attachment #2: Type: text/html, Size: 2840 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/selftests: Unwind hugepages to drop wakeref on error (rev3)
2023-01-17 12:32 ` [Intel-gfx] " Nirmoy Das
` (3 preceding siblings ...)
(?)
@ 2023-01-17 22:27 ` Patchwork
-1 siblings, 0 replies; 10+ messages in thread
From: Patchwork @ 2023-01-17 22:27 UTC (permalink / raw)
To: Das, Nirmoy; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 20822 bytes --]
== Series Details ==
Series: drm/i915/selftests: Unwind hugepages to drop wakeref on error (rev3)
URL : https://patchwork.freedesktop.org/series/112801/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12590_full -> Patchwork_112801v3_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/index.html
Participating hosts (13 -> 11)
------------------------------
Additional (1): shard-rkl0
Missing (3): pig-skl-6260u pig-kbl-iris pig-glk-j5005
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_112801v3_full:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@gem_eio@unwedge-stress:
- {shard-dg1}: NOTRUN -> [DMESG-FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-dg1-14/igt@gem_eio@unwedge-stress.html
* igt@kms_big_fb@y-tiled-32bpp-rotate-90:
- {shard-dg1}: NOTRUN -> [DMESG-WARN][2] +2 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-dg1-14/igt@kms_big_fb@y-tiled-32bpp-rotate-90.html
* igt@perf_pmu@module-unload:
- {shard-dg1}: [PASS][3] -> [DMESG-WARN][4] +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-dg1-19/igt@perf_pmu@module-unload.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-dg1-14/igt@perf_pmu@module-unload.html
New tests
---------
New tests have been introduced between CI_DRM_12590_full and Patchwork_112801v3_full:
### New IGT tests (1) ###
* igt@gem_exec_fair@basic-pace@vcs1:
- Statuses : 1 fail(s)
- Exec time: [0.0] s
Known issues
------------
Here are the changes found in Patchwork_112801v3_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_fair@basic-none@vecs0:
- shard-glk: [PASS][5] -> [FAIL][6] ([i915#2842])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-glk5/igt@gem_exec_fair@basic-none@vecs0.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-glk2/igt@gem_exec_fair@basic-none@vecs0.html
* igt@gem_exec_fair@basic-pace@vcs1 (NEW):
- {shard-tglu-9}: NOTRUN -> [FAIL][7] ([i915#2842])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-tglu-9/igt@gem_exec_fair@basic-pace@vcs1.html
* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-glk: NOTRUN -> [FAIL][8] ([i915#2842])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-glk8/igt@gem_exec_fair@basic-throttle@rcs0.html
* igt@gem_lmem_swapping@heavy-verify-multi-ccs:
- shard-glk: NOTRUN -> [SKIP][9] ([fdo#109271] / [i915#4613])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-glk8/igt@gem_lmem_swapping@heavy-verify-multi-ccs.html
* igt@kms_ccs@pipe-b-bad-aux-stride-y_tiled_gen12_rc_ccs_cc:
- shard-glk: NOTRUN -> [SKIP][10] ([fdo#109271] / [i915#3886]) +3 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-glk8/igt@kms_ccs@pipe-b-bad-aux-stride-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_cursor_crc@cursor-random-max-size:
- shard-glk: NOTRUN -> [SKIP][11] ([fdo#109271]) +48 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-glk8/igt@kms_cursor_crc@cursor-random-max-size.html
* igt@kms_dsc@dsc-with-bpc-formats:
- shard-glk: NOTRUN -> [SKIP][12] ([fdo#109271] / [i915#7205])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-glk8/igt@kms_dsc@dsc-with-bpc-formats.html
* igt@kms_plane_alpha_blend@alpha-transparent-fb@pipe-b-hdmi-a-2:
- shard-glk: NOTRUN -> [FAIL][13] ([i915#4573]) +2 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-glk8/igt@kms_plane_alpha_blend@alpha-transparent-fb@pipe-b-hdmi-a-2.html
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area:
- shard-glk: NOTRUN -> [SKIP][14] ([fdo#109271] / [i915#658])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-glk8/igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area.html
* igt@kms_writeback@writeback-fb-id:
- shard-glk: NOTRUN -> [SKIP][15] ([fdo#109271] / [i915#2437])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-glk8/igt@kms_writeback@writeback-fb-id.html
#### Possible fixes ####
* igt@drm_fdinfo@idle@rcs0:
- {shard-rkl}: [FAIL][16] ([i915#7742]) -> [PASS][17]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-rkl-2/igt@drm_fdinfo@idle@rcs0.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-rkl-1/igt@drm_fdinfo@idle@rcs0.html
* igt@gem_eio@kms:
- {shard-dg1}: [FAIL][18] ([i915#5784]) -> [PASS][19]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-dg1-15/igt@gem_eio@kms.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-dg1-19/igt@gem_eio@kms.html
* igt@gem_exec_endless@dispatch@bcs0:
- {shard-rkl}: [SKIP][20] ([i915#6247]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-rkl-5/igt@gem_exec_endless@dispatch@bcs0.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-rkl-4/igt@gem_exec_endless@dispatch@bcs0.html
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-glk: [FAIL][22] ([i915#2842]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-glk8/igt@gem_exec_fair@basic-none-share@rcs0.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-glk5/igt@gem_exec_fair@basic-none-share@rcs0.html
* igt@gem_exec_fair@basic-pace@rcs0:
- {shard-rkl}: [FAIL][24] ([i915#2842]) -> [PASS][25] +3 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-rkl-3/igt@gem_exec_fair@basic-pace@rcs0.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-rkl-5/igt@gem_exec_fair@basic-pace@rcs0.html
* igt@gem_exec_reloc@basic-gtt-cpu:
- {shard-rkl}: [SKIP][26] ([i915#3281]) -> [PASS][27] +9 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-rkl-3/igt@gem_exec_reloc@basic-gtt-cpu.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-rkl-5/igt@gem_exec_reloc@basic-gtt-cpu.html
* igt@gem_madvise@dontneed-before-exec:
- {shard-rkl}: [SKIP][28] ([i915#3282]) -> [PASS][29] +3 similar issues
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-rkl-3/igt@gem_madvise@dontneed-before-exec.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-rkl-5/igt@gem_madvise@dontneed-before-exec.html
* igt@gen9_exec_parse@batch-invalid-length:
- {shard-rkl}: [SKIP][30] ([i915#2527]) -> [PASS][31] +1 similar issue
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-rkl-3/igt@gen9_exec_parse@batch-invalid-length.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-rkl-5/igt@gen9_exec_parse@batch-invalid-length.html
* igt@i915_pm_rc6_residency@rc6-idle@vcs0:
- {shard-dg1}: [FAIL][32] ([i915#3591]) -> [PASS][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-dg1-12/igt@i915_pm_rc6_residency@rc6-idle@vcs0.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-dg1-17/igt@i915_pm_rc6_residency@rc6-idle@vcs0.html
* igt@i915_pm_sseu@full-enable:
- {shard-rkl}: [SKIP][34] ([i915#4387]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-rkl-3/igt@i915_pm_sseu@full-enable.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-rkl-5/igt@i915_pm_sseu@full-enable.html
* igt@kms_big_fb@linear-64bpp-rotate-180:
- {shard-rkl}: [SKIP][36] ([i915#1845] / [i915#4098]) -> [PASS][37] +23 similar issues
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-rkl-2/igt@kms_big_fb@linear-64bpp-rotate-180.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-rkl-6/igt@kms_big_fb@linear-64bpp-rotate-180.html
* igt@kms_frontbuffer_tracking@fbc-tiling-linear:
- {shard-tglu}: [SKIP][38] ([i915#1849]) -> [PASS][39] +3 similar issues
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-tglu-6/igt@kms_frontbuffer_tracking@fbc-tiling-linear.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-tglu-1/igt@kms_frontbuffer_tracking@fbc-tiling-linear.html
* igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-onoff:
- {shard-rkl}: [SKIP][40] ([i915#1849] / [i915#4098]) -> [PASS][41] +17 similar issues
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-rkl-2/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-onoff.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-rkl-6/igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-onoff.html
* igt@kms_psr@cursor_render:
- {shard-rkl}: [SKIP][42] ([i915#1072]) -> [PASS][43]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-rkl-2/igt@kms_psr@cursor_render.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-rkl-6/igt@kms_psr@cursor_render.html
* igt@kms_psr_stress_test@flip-primary-invalidate-overlay:
- {shard-rkl}: [SKIP][44] ([i915#5461]) -> [PASS][45]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-rkl-2/igt@kms_psr_stress_test@flip-primary-invalidate-overlay.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-rkl-6/igt@kms_psr_stress_test@flip-primary-invalidate-overlay.html
* igt@kms_universal_plane@universal-plane-pipe-b-sanity:
- {shard-rkl}: [SKIP][46] ([i915#1845] / [i915#4070] / [i915#4098]) -> [PASS][47]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-rkl-2/igt@kms_universal_plane@universal-plane-pipe-b-sanity.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-rkl-6/igt@kms_universal_plane@universal-plane-pipe-b-sanity.html
* igt@kms_vblank@pipe-b-ts-continuation-suspend:
- {shard-tglu}: [SKIP][48] ([i915#7651]) -> [PASS][49] +6 similar issues
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-tglu-6/igt@kms_vblank@pipe-b-ts-continuation-suspend.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-tglu-1/igt@kms_vblank@pipe-b-ts-continuation-suspend.html
* igt@kms_vblank@pipe-c-wait-idle-hang:
- {shard-tglu}: [SKIP][50] ([i915#1845] / [i915#7651]) -> [PASS][51] +3 similar issues
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-tglu-6/igt@kms_vblank@pipe-c-wait-idle-hang.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-tglu-1/igt@kms_vblank@pipe-c-wait-idle-hang.html
* igt@perf@gen12-mi-rpc:
- {shard-rkl}: [SKIP][52] ([fdo#109289]) -> [PASS][53]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-rkl-5/igt@perf@gen12-mi-rpc.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-rkl-4/igt@perf@gen12-mi-rpc.html
* igt@sysfs_timeslice_duration@timeout@rcs0:
- {shard-dg1}: [FAIL][54] ([i915#1755]) -> [PASS][55] +3 similar issues
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12590/shard-dg1-14/igt@sysfs_timeslice_duration@timeout@rcs0.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v3/shard-dg1-17/igt@sysfs_timeslice_duration@timeout@rcs0.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
[fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312
[fdo#109314]: https://bugs.freedesktop.org/show_bug.cgi?id=109314
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644
[fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112054]: https://bugs.freedesktop.org/show_bug.cgi?id=112054
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1755]: https://gitlab.freedesktop.org/drm/intel/issues/1755
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#1902]: https://gitlab.freedesktop.org/drm/intel/issues/1902
[i915#2232]: https://gitlab.freedesktop.org/drm/intel/issues/2232
[i915#2436]: https://gitlab.freedesktop.org/drm/intel/issues/2436
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3469]: https://gitlab.freedesktop.org/drm/intel/issues/3469
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3966]: https://gitlab.freedesktop.org/drm/intel/issues/3966
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4387]: https://gitlab.freedesktop.org/drm/intel/issues/4387
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4573]: https://gitlab.freedesktop.org/drm/intel/issues/4573
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4767]: https://gitlab.freedesktop.org/drm/intel/issues/4767
[i915#4877]: https://gitlab.freedesktop.org/drm/intel/issues/4877
[i915#5030]: https://gitlab.freedesktop.org/drm/intel/issues/5030
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5288]: https://gitlab.freedesktop.org/drm/intel/issues/5288
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#5327]: https://gitlab.freedesktop.org/drm/intel/issues/5327
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461
[i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
[i915#5784]: https://gitlab.freedesktop.org/drm/intel/issues/5784
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6117]: https://gitlab.freedesktop.org/drm/intel/issues/6117
[i915#6247]: https://gitlab.freedesktop.org/drm/intel/issues/6247
[i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248
[i915#6258]: https://gitlab.freedesktop.org/drm/intel/issues/6258
[i915#6301]: https://gitlab.freedesktop.org/drm/intel/issues/6301
[i915#6355]: https://gitlab.freedesktop.org/drm/intel/issues/6355
[i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6590]: https://gitlab.freedesktop.org/drm/intel/issues/6590
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944
[i915#6946]: https://gitlab.freedesktop.org/drm/intel/issues/6946
[i915#6953]: https://gitlab.freedesktop.org/drm/intel/issues/6953
[i915#7037]: https://gitlab.freedesktop.org/drm/intel/issues/7037
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#7205]: https://gitlab.freedesktop.org/drm/intel/issues/7205
[i915#7276]: https://gitlab.freedesktop.org/drm/intel/issues/7276
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7651]: https://gitlab.freedesktop.org/drm/intel/issues/7651
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7701]: https://gitlab.freedesktop.org/drm/intel/issues/7701
[i915#7707]: https://gitlab.freedesktop.org/drm/intel/issues/7707
[i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
Build changes
-------------
* Linux: CI_DRM_12590 -> Patchwork_112801v3
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_12590: aa9844e5dcac30f3b7c09fa0218516692698f0e2 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7121: aa16e81259f59734230d441905b9d0f605e4a4b5 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_112801v3: aa9844e5dcac30f3b7c09fa0218516692698f0e2 @ 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_112801v3/index.html
[-- Attachment #2: Type: text/html, Size: 16991 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2] drm/i915/selftests: Unwind hugepages to drop wakeref on error
2023-01-17 12:32 ` [Intel-gfx] " Nirmoy Das
@ 2023-01-18 9:32 ` Andi Shyti
-1 siblings, 0 replies; 10+ messages in thread
From: Andi Shyti @ 2023-01-18 9:32 UTC (permalink / raw)
To: Nirmoy Das
Cc: Andi Shyti, intel-gfx, dri-devel, Matthew Auld, Andrzej Hajda,
chris.p.wilson
Hi Nirmoy,
On Tue, Jan 17, 2023 at 01:32:34PM +0100, Nirmoy Das wrote:
> From: Chris Wilson <chris.p.wilson@linux.intel.com>
>
> Make sure that upon error after we have acquired the wakeref we do
> release it again.
>
> v2: add another missing "goto out_wf"(Andi).
>
> Fixes: 027c38b4121e ("drm/i915/selftests: Grab the runtime pm in shrink_thp")
> Cc: Andi Shyti <andi.shyti@linux.intel.com>
> Reviewed-by: Matthew Auld <matthew.auld@intel.com>
> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
> Signed-off-by: Chris Wilson <chris.p.wilson@linux.intel.com>
> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
pushed in drm-intel-gt-next.
Thanks,
Andi
> ---
> drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> index c281b0ec9e05..defece0bcb81 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> @@ -1855,7 +1855,7 @@ static int igt_shrink_thp(void *arg)
> I915_SHRINK_ACTIVE);
> i915_vma_unpin(vma);
> if (err)
> - goto out_put;
> + goto out_wf;
>
> /*
> * Now that the pages are *unpinned* shrinking should invoke
> @@ -1871,19 +1871,19 @@ static int igt_shrink_thp(void *arg)
> pr_err("unexpected pages mismatch, should_swap=%s\n",
> str_yes_no(should_swap));
> err = -EINVAL;
> - goto out_put;
> + goto out_wf;
> }
>
> if (should_swap == (obj->mm.page_sizes.sg || obj->mm.page_sizes.phys)) {
> pr_err("unexpected residual page-size bits, should_swap=%s\n",
> str_yes_no(should_swap));
> err = -EINVAL;
> - goto out_put;
> + goto out_wf;
> }
>
> err = i915_vma_pin(vma, 0, 0, flags);
> if (err)
> - goto out_put;
> + goto out_wf;
>
> while (n--) {
> err = cpu_check(obj, n, 0xdeadbeaf);
> --
> 2.39.0
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Intel-gfx] [PATCH v2] drm/i915/selftests: Unwind hugepages to drop wakeref on error
@ 2023-01-18 9:32 ` Andi Shyti
0 siblings, 0 replies; 10+ messages in thread
From: Andi Shyti @ 2023-01-18 9:32 UTC (permalink / raw)
To: Nirmoy Das
Cc: intel-gfx, dri-devel, Matthew Auld, Andrzej Hajda, chris.p.wilson
Hi Nirmoy,
On Tue, Jan 17, 2023 at 01:32:34PM +0100, Nirmoy Das wrote:
> From: Chris Wilson <chris.p.wilson@linux.intel.com>
>
> Make sure that upon error after we have acquired the wakeref we do
> release it again.
>
> v2: add another missing "goto out_wf"(Andi).
>
> Fixes: 027c38b4121e ("drm/i915/selftests: Grab the runtime pm in shrink_thp")
> Cc: Andi Shyti <andi.shyti@linux.intel.com>
> Reviewed-by: Matthew Auld <matthew.auld@intel.com>
> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
> Signed-off-by: Chris Wilson <chris.p.wilson@linux.intel.com>
> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
pushed in drm-intel-gt-next.
Thanks,
Andi
> ---
> drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> index c281b0ec9e05..defece0bcb81 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
> @@ -1855,7 +1855,7 @@ static int igt_shrink_thp(void *arg)
> I915_SHRINK_ACTIVE);
> i915_vma_unpin(vma);
> if (err)
> - goto out_put;
> + goto out_wf;
>
> /*
> * Now that the pages are *unpinned* shrinking should invoke
> @@ -1871,19 +1871,19 @@ static int igt_shrink_thp(void *arg)
> pr_err("unexpected pages mismatch, should_swap=%s\n",
> str_yes_no(should_swap));
> err = -EINVAL;
> - goto out_put;
> + goto out_wf;
> }
>
> if (should_swap == (obj->mm.page_sizes.sg || obj->mm.page_sizes.phys)) {
> pr_err("unexpected residual page-size bits, should_swap=%s\n",
> str_yes_no(should_swap));
> err = -EINVAL;
> - goto out_put;
> + goto out_wf;
> }
>
> err = i915_vma_pin(vma, 0, 0, flags);
> if (err)
> - goto out_put;
> + goto out_wf;
>
> while (n--) {
> err = cpu_check(obj, n, 0xdeadbeaf);
> --
> 2.39.0
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-01-18 9:32 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-17 12:32 [PATCH v2] drm/i915/selftests: Unwind hugepages to drop wakeref on error Nirmoy Das
2023-01-17 12:32 ` [Intel-gfx] " Nirmoy Das
2023-01-17 13:57 ` Andi Shyti
2023-01-17 13:57 ` [Intel-gfx] " Andi Shyti
2023-01-17 14:24 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/selftests: Unwind hugepages to drop wakeref on error (rev3) Patchwork
2023-01-17 16:05 ` [PATCH v2] drm/i915/selftests: Unwind hugepages to drop wakeref on error Das, Nirmoy
2023-01-17 16:05 ` [Intel-gfx] " Das, Nirmoy
2023-01-17 22:27 ` [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/selftests: Unwind hugepages to drop wakeref on error (rev3) Patchwork
2023-01-18 9:32 ` [PATCH v2] drm/i915/selftests: Unwind hugepages to drop wakeref on error Andi Shyti
2023-01-18 9:32 ` [Intel-gfx] " Andi Shyti
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.