* [Intel-gfx] [PATCH] drm/i915/selftests: Unwind hugepages to drop wakeref on error
@ 2023-01-13 11:49 Nirmoy Das
2023-01-13 11:51 ` Matthew Auld
2023-01-16 11:21 ` Andrzej Hajda
0 siblings, 2 replies; 11+ messages in thread
From: Nirmoy Das @ 2023-01-13 11:49 UTC (permalink / raw)
To: intel-gfx; +Cc: Nirmoy Das, chris.p.wilson, matthew.auld, dri-devel
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.
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 | 6 +++---
1 file changed, 3 insertions(+), 3 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..295d6f2cc4ff 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,7 +1871,7 @@ 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)) {
@@ -1883,7 +1883,7 @@ static int igt_shrink_thp(void *arg)
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] 11+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/selftests: Unwind hugepages to drop wakeref on error
2023-01-13 11:49 Nirmoy Das
@ 2023-01-13 11:51 ` Matthew Auld
2023-01-13 12:02 ` Das, Nirmoy
2023-01-16 11:21 ` Andrzej Hajda
1 sibling, 1 reply; 11+ messages in thread
From: Matthew Auld @ 2023-01-13 11:51 UTC (permalink / raw)
To: Nirmoy Das, intel-gfx; +Cc: chris.p.wilson, dri-devel
On 13/01/2023 11:49, 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.
>
> Signed-off-by: Chris Wilson <chris.p.wilson@linux.intel.com>
> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Intel-gfx] [PATCH] drm/i915/selftests: Unwind hugepages to drop wakeref on error
@ 2023-01-13 12:00 Nirmoy Das
2023-01-13 14:07 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/selftests: Unwind hugepages to drop wakeref on error (rev2) Patchwork
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Nirmoy Das @ 2023-01-13 12:00 UTC (permalink / raw)
To: intel-gfx; +Cc: dri-devel, stable, matthew.auld, 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.
Fixes: 027c38b4121e ("drm/i915/selftests: Grab the runtime pm in shrink_thp")
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Chris Wilson <chris.p.wilson@linux.intel.com>
Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
Cc: <stable@vger.kernel.org> # v6.0+
---
drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 6 +++---
1 file changed, 3 insertions(+), 3 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..295d6f2cc4ff 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,7 +1871,7 @@ 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)) {
@@ -1883,7 +1883,7 @@ static int igt_shrink_thp(void *arg)
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] 11+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/selftests: Unwind hugepages to drop wakeref on error
2023-01-13 11:51 ` Matthew Auld
@ 2023-01-13 12:02 ` Das, Nirmoy
2023-01-13 12:05 ` Matthew Auld
0 siblings, 1 reply; 11+ messages in thread
From: Das, Nirmoy @ 2023-01-13 12:02 UTC (permalink / raw)
To: Matthew Auld, Nirmoy Das, intel-gfx; +Cc: chris.p.wilson, dri-devel
Thanks Matt, I missed the Fixes tag so resent it with fixes and Cc to
stable.
On 1/13/2023 12:51 PM, Matthew Auld wrote:
> On 13/01/2023 11:49, 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.
>>
>> Signed-off-by: Chris Wilson <chris.p.wilson@linux.intel.com>
>> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
> Reviewed-by: Matthew Auld <matthew.auld@intel.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/selftests: Unwind hugepages to drop wakeref on error
2023-01-13 12:02 ` Das, Nirmoy
@ 2023-01-13 12:05 ` Matthew Auld
2023-01-13 12:07 ` Das, Nirmoy
0 siblings, 1 reply; 11+ messages in thread
From: Matthew Auld @ 2023-01-13 12:05 UTC (permalink / raw)
To: Das, Nirmoy, Nirmoy Das, intel-gfx; +Cc: chris.p.wilson, dri-devel
On 13/01/2023 12:02, Das, Nirmoy wrote:
> Thanks Matt, I missed the Fixes tag so resent it with fixes and Cc to
> stable.
I don't think kernel selftests are really stable material. AFAIK it's
not something normal users care about.
>
> On 1/13/2023 12:51 PM, Matthew Auld wrote:
>> On 13/01/2023 11:49, 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.
>>>
>>> Signed-off-by: Chris Wilson <chris.p.wilson@linux.intel.com>
>>> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
>> Reviewed-by: Matthew Auld <matthew.auld@intel.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/selftests: Unwind hugepages to drop wakeref on error
2023-01-13 12:05 ` Matthew Auld
@ 2023-01-13 12:07 ` Das, Nirmoy
0 siblings, 0 replies; 11+ messages in thread
From: Das, Nirmoy @ 2023-01-13 12:07 UTC (permalink / raw)
To: Matthew Auld, Nirmoy Das, intel-gfx; +Cc: chris.p.wilson, dri-devel
On 1/13/2023 1:05 PM, Matthew Auld wrote:
> On 13/01/2023 12:02, Das, Nirmoy wrote:
>> Thanks Matt, I missed the Fixes tag so resent it with fixes and Cc to
>> stable.
>
> I don't think kernel selftests are really stable material. AFAIK it's
> not something normal users care about.
True, in that case please ignore the latest copy of this patch!.
Thanks,
Nirmoy
>
>>
>> On 1/13/2023 12:51 PM, Matthew Auld wrote:
>>> On 13/01/2023 11:49, 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.
>>>>
>>>> Signed-off-by: Chris Wilson <chris.p.wilson@linux.intel.com>
>>>> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
>>> Reviewed-by: Matthew Auld <matthew.auld@intel.com>
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/selftests: Unwind hugepages to drop wakeref on error (rev2)
2023-01-13 12:00 [Intel-gfx] [PATCH] drm/i915/selftests: Unwind hugepages to drop wakeref on error Nirmoy Das
@ 2023-01-13 14:07 ` Patchwork
2023-01-13 21:52 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2023-01-16 18:49 ` [Intel-gfx] [PATCH] drm/i915/selftests: Unwind hugepages to drop wakeref on error Andi Shyti
2 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2023-01-13 14:07 UTC (permalink / raw)
To: Nirmoy Das; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 5166 bytes --]
== Series Details ==
Series: drm/i915/selftests: Unwind hugepages to drop wakeref on error (rev2)
URL : https://patchwork.freedesktop.org/series/112801/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12582 -> Patchwork_112801v2
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/index.html
Participating hosts (44 -> 43)
------------------------------
Missing (1): fi-snb-2520m
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_112801v2:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@kms_cursor_legacy@basic-flip-after-cursor@legacy:
- {bat-dg2-11}: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/bat-dg2-11/igt@kms_cursor_legacy@basic-flip-after-cursor@legacy.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/bat-dg2-11/igt@kms_cursor_legacy@basic-flip-after-cursor@legacy.html
Known issues
------------
Here are the changes found in Patchwork_112801v2 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- fi-rkl-11600: NOTRUN -> [SKIP][3] ([i915#7828])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/fi-rkl-11600/igt@kms_chamelium_hpd@common-hpd-after-suspend.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions:
- fi-bsw-kefka: [PASS][4] -> [FAIL][5] ([i915#6298])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions.html
* igt@kms_pipe_crc_basic@suspend-read-crc:
- fi-bsw-nick: NOTRUN -> [SKIP][6] ([fdo#109271]) +1 similar issue
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/fi-bsw-nick/igt@kms_pipe_crc_basic@suspend-read-crc.html
#### Possible fixes ####
* igt@gem_exec_gttfill@basic:
- fi-pnv-d510: [FAIL][7] ([i915#7229]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/fi-pnv-d510/igt@gem_exec_gttfill@basic.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/fi-pnv-d510/igt@gem_exec_gttfill@basic.html
* igt@i915_selftest@live@execlists:
- fi-bsw-nick: [INCOMPLETE][9] -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/fi-bsw-nick/igt@i915_selftest@live@execlists.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/fi-bsw-nick/igt@i915_selftest@live@execlists.html
* igt@i915_selftest@live@migrate:
- {bat-adlp-6}: [DMESG-FAIL][11] ([i915#7699]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/bat-adlp-6/igt@i915_selftest@live@migrate.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/bat-adlp-6/igt@i915_selftest@live@migrate.html
#### Warnings ####
* igt@i915_suspend@basic-s3-without-i915:
- fi-rkl-11600: [INCOMPLETE][13] ([i915#4817]) -> [FAIL][14] ([fdo#103375])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/fi-rkl-11600/igt@i915_suspend@basic-s3-without-i915.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/fi-rkl-11600/igt@i915_suspend@basic-s3-without-i915.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258
[i915#4817]: https://gitlab.freedesktop.org/drm/intel/issues/4817
[i915#6298]: https://gitlab.freedesktop.org/drm/intel/issues/6298
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6997]: https://gitlab.freedesktop.org/drm/intel/issues/6997
[i915#7229]: https://gitlab.freedesktop.org/drm/intel/issues/7229
[i915#7699]: https://gitlab.freedesktop.org/drm/intel/issues/7699
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
Build changes
-------------
* Linux: CI_DRM_12582 -> Patchwork_112801v2
CI-20190529: 20190529
CI_DRM_12582: 312e96256f0520b8660750dd4fc937f63c2f359e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7119: 1e6d24e6dfa42b22f950f7d5e436b8f9acf8747f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_112801v2: 312e96256f0520b8660750dd4fc937f63c2f359e @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
084ad799e5da 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_112801v2/index.html
[-- Attachment #2: Type: text/html, Size: 5770 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/selftests: Unwind hugepages to drop wakeref on error (rev2)
2023-01-13 12:00 [Intel-gfx] [PATCH] drm/i915/selftests: Unwind hugepages to drop wakeref on error Nirmoy Das
2023-01-13 14:07 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/selftests: Unwind hugepages to drop wakeref on error (rev2) Patchwork
@ 2023-01-13 21:52 ` Patchwork
2023-01-16 18:49 ` [Intel-gfx] [PATCH] drm/i915/selftests: Unwind hugepages to drop wakeref on error Andi Shyti
2 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2023-01-13 21:52 UTC (permalink / raw)
To: Nirmoy Das; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 21161 bytes --]
== Series Details ==
Series: drm/i915/selftests: Unwind hugepages to drop wakeref on error (rev2)
URL : https://patchwork.freedesktop.org/series/112801/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12582_full -> Patchwork_112801v2_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/index.html
Participating hosts (12 -> 10)
------------------------------
Additional (1): shard-rkl0
Missing (3): pig-skl-6260u pig-kbl-iris pig-glk-j5005
Known issues
------------
Here are the changes found in Patchwork_112801v2_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-glk: [PASS][1] -> [FAIL][2] ([i915#2842])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-glk1/igt@gem_exec_fair@basic-pace-share@rcs0.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-glk2/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@kms_ccs@pipe-c-random-ccs-data-y_tiled_ccs:
- shard-glk: NOTRUN -> [SKIP][3] ([fdo#109271]) +5 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-glk2/igt@kms_ccs@pipe-c-random-ccs-data-y_tiled_ccs.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1:
- shard-glk: [PASS][4] -> [FAIL][5] ([i915#79]) +1 similar issue
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-glk5/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-glk5/igt@kms_flip@flip-vs-expired-vblank-interruptible@c-hdmi-a1.html
#### Possible fixes ####
* igt@fbdev@write:
- {shard-dg1}: [FAIL][6] ([i915#7863]) -> [PASS][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-dg1-16/igt@fbdev@write.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-dg1-17/igt@fbdev@write.html
* igt@gem_eio@in-flight-suspend:
- {shard-rkl}: [FAIL][8] ([fdo#103375]) -> [PASS][9] +1 similar issue
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-4/igt@gem_eio@in-flight-suspend.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-rkl-1/igt@gem_eio@in-flight-suspend.html
* igt@gem_eio@suspend:
- {shard-rkl}: [FAIL][10] ([i915#7052]) -> [PASS][11] +1 similar issue
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-4/igt@gem_eio@suspend.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-rkl-1/igt@gem_eio@suspend.html
* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-glk: [FAIL][12] ([i915#2842]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-glk3/igt@gem_exec_fair@basic-pace-solo@rcs0.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-glk1/igt@gem_exec_fair@basic-pace-solo@rcs0.html
* igt@gem_exec_fair@basic-throttle@rcs0:
- {shard-rkl}: [FAIL][14] ([i915#2842]) -> [PASS][15] +1 similar issue
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-4/igt@gem_exec_fair@basic-throttle@rcs0.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-rkl-5/igt@gem_exec_fair@basic-throttle@rcs0.html
* igt@gem_exec_reloc@basic-scanout@vcs0:
- {shard-tglu}: [SKIP][16] ([i915#3639]) -> [PASS][17] +4 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-tglu-6/igt@gem_exec_reloc@basic-scanout@vcs0.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-tglu-2/igt@gem_exec_reloc@basic-scanout@vcs0.html
* igt@gem_exec_reloc@basic-wc-read-noreloc:
- {shard-rkl}: [SKIP][18] ([i915#3281]) -> [PASS][19] +14 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-3/igt@gem_exec_reloc@basic-wc-read-noreloc.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-rkl-5/igt@gem_exec_reloc@basic-wc-read-noreloc.html
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-glk: [FAIL][20] -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-glk1/igt@gem_ppgtt@flink-and-close-vma-leak.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-glk2/igt@gem_ppgtt@flink-and-close-vma-leak.html
* igt@gem_pwrite@basic-self:
- {shard-rkl}: [SKIP][22] ([i915#3282]) -> [PASS][23] +6 similar issues
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-3/igt@gem_pwrite@basic-self.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-rkl-5/igt@gem_pwrite@basic-self.html
* igt@gen9_exec_parse@bb-start-out:
- {shard-rkl}: [SKIP][24] ([i915#2527]) -> [PASS][25] +4 similar issues
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-3/igt@gen9_exec_parse@bb-start-out.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-rkl-5/igt@gen9_exec_parse@bb-start-out.html
* igt@i915_pm_dc@dc6-dpms:
- {shard-tglu}: [FAIL][26] ([i915#3989] / [i915#454]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-tglu-6/igt@i915_pm_dc@dc6-dpms.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-tglu-2/igt@i915_pm_dc@dc6-dpms.html
* igt@i915_pm_dc@dc9-dpms:
- {shard-tglu}: [SKIP][28] ([i915#4281]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-tglu-1/igt@i915_pm_dc@dc9-dpms.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-tglu-4/igt@i915_pm_dc@dc9-dpms.html
* igt@i915_pm_rc6_residency@rc6-idle@rcs0:
- {shard-dg1}: [FAIL][30] ([i915#3591]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-dg1-18/igt@i915_pm_rc6_residency@rc6-idle@rcs0.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-dg1-12/igt@i915_pm_rc6_residency@rc6-idle@rcs0.html
* igt@i915_pm_rpm@dpms-lpsp:
- {shard-dg1}: [SKIP][32] ([i915#1397]) -> [PASS][33] +1 similar issue
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-dg1-15/igt@i915_pm_rpm@dpms-lpsp.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-dg1-14/igt@i915_pm_rpm@dpms-lpsp.html
* igt@i915_pm_rpm@modeset-lpsp-stress-no-wait:
- {shard-tglu}: [SKIP][34] ([i915#1397]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-tglu-6/igt@i915_pm_rpm@modeset-lpsp-stress-no-wait.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-tglu-2/igt@i915_pm_rpm@modeset-lpsp-stress-no-wait.html
* igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-hflip:
- {shard-tglu}: [SKIP][36] ([i915#1845] / [i915#7651]) -> [PASS][37] +1 similar issue
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-tglu-6/igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-hflip.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-tglu-2/igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-hflip.html
* igt@kms_ccs@pipe-c-bad-aux-stride-y_tiled_gen12_rc_ccs:
- {shard-tglu}: [SKIP][38] ([i915#7651]) -> [PASS][39] +12 similar issues
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-tglu-6/igt@kms_ccs@pipe-c-bad-aux-stride-y_tiled_gen12_rc_ccs.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-tglu-2/igt@kms_ccs@pipe-c-bad-aux-stride-y_tiled_gen12_rc_ccs.html
* igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions:
- shard-glk: [FAIL][40] ([i915#2346]) -> [PASS][41]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-glk2/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-glk7/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions.html
* igt@kms_fence_pin_leak:
- {shard-tglu}: [SKIP][42] ([fdo#109274] / [i915#1845]) -> [PASS][43]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-tglu-6/igt@kms_fence_pin_leak.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-tglu-2/igt@kms_fence_pin_leak.html
* igt@kms_flip@flip-vs-expired-vblank@a-hdmi-a1:
- shard-glk: [FAIL][44] ([i915#79]) -> [PASS][45]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-glk1/igt@kms_flip@flip-vs-expired-vblank@a-hdmi-a1.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-glk6/igt@kms_flip@flip-vs-expired-vblank@a-hdmi-a1.html
* igt@kms_frontbuffer_tracking@fbc-rgb565-draw-mmap-gtt:
- {shard-tglu}: [SKIP][46] ([i915#1849]) -> [PASS][47] +3 similar issues
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-tglu-6/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-mmap-gtt.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-tglu-2/igt@kms_frontbuffer_tracking@fbc-rgb565-draw-mmap-gtt.html
* igt@kms_hdmi_inject@inject-audio:
- {shard-rkl}: [SKIP][48] ([i915#433]) -> [PASS][49]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-3/igt@kms_hdmi_inject@inject-audio.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-rkl-5/igt@kms_hdmi_inject@inject-audio.html
- {shard-tglu}: [SKIP][50] ([i915#433]) -> [PASS][51]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-tglu-6/igt@kms_hdmi_inject@inject-audio.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-tglu-2/igt@kms_hdmi_inject@inject-audio.html
* igt@kms_plane@pixel-format-source-clamping@pipe-b-planes:
- {shard-tglu}: [SKIP][52] ([i915#1849] / [i915#3558]) -> [PASS][53] +1 similar issue
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-tglu-6/igt@kms_plane@pixel-format-source-clamping@pipe-b-planes.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-tglu-2/igt@kms_plane@pixel-format-source-clamping@pipe-b-planes.html
* igt@perf@mi-rpc:
- {shard-rkl}: [SKIP][54] ([i915#2434]) -> [PASS][55]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-6/igt@perf@mi-rpc.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-rkl-5/igt@perf@mi-rpc.html
* igt@perf_pmu@idle@rcs0:
- {shard-rkl}: [FAIL][56] ([i915#4349]) -> [PASS][57]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-rkl-3/igt@perf_pmu@idle@rcs0.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-rkl-5/igt@perf_pmu@idle@rcs0.html
* igt@sysfs_timeslice_duration@timeout@rcs0:
- {shard-dg1}: [FAIL][58] ([i915#1755]) -> [PASS][59] +1 similar issue
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12582/shard-dg1-12/igt@sysfs_timeslice_duration@timeout@rcs0.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_112801v2/shard-dg1-19/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#103375]: https://bugs.freedesktop.org/show_bug.cgi?id=103375
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109302]: https://bugs.freedesktop.org/show_bug.cgi?id=109302
[fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309
[fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[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#1769]: https://gitlab.freedesktop.org/drm/intel/issues/1769
[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#1850]: https://gitlab.freedesktop.org/drm/intel/issues/1850
[i915#1902]: https://gitlab.freedesktop.org/drm/intel/issues/1902
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2434]: https://gitlab.freedesktop.org/drm/intel/issues/2434
[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#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[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#2681]: https://gitlab.freedesktop.org/drm/intel/issues/2681
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#284]: https://gitlab.freedesktop.org/drm/intel/issues/284
[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#315]: https://gitlab.freedesktop.org/drm/intel/issues/315
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3318]: https://gitlab.freedesktop.org/drm/intel/issues/3318
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3361]: https://gitlab.freedesktop.org/drm/intel/issues/3361
[i915#3469]: https://gitlab.freedesktop.org/drm/intel/issues/3469
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3547]: https://gitlab.freedesktop.org/drm/intel/issues/3547
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3558]: https://gitlab.freedesktop.org/drm/intel/issues/3558
[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#3639]: https://gitlab.freedesktop.org/drm/intel/issues/3639
[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#3810]: https://gitlab.freedesktop.org/drm/intel/issues/3810
[i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#3966]: https://gitlab.freedesktop.org/drm/intel/issues/3966
[i915#3989]: https://gitlab.freedesktop.org/drm/intel/issues/3989
[i915#404]: https://gitlab.freedesktop.org/drm/intel/issues/404
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[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#4281]: https://gitlab.freedesktop.org/drm/intel/issues/4281
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#433]: https://gitlab.freedesktop.org/drm/intel/issues/433
[i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#4387]: https://gitlab.freedesktop.org/drm/intel/issues/4387
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4877]: https://gitlab.freedesktop.org/drm/intel/issues/4877
[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#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
[i915#5461]: https://gitlab.freedesktop.org/drm/intel/issues/5461
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6117]: https://gitlab.freedesktop.org/drm/intel/issues/6117
[i915#6245]: https://gitlab.freedesktop.org/drm/intel/issues/6245
[i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248
[i915#6259]: https://gitlab.freedesktop.org/drm/intel/issues/6259
[i915#6268]: https://gitlab.freedesktop.org/drm/intel/issues/6268
[i915#6301]: https://gitlab.freedesktop.org/drm/intel/issues/6301
[i915#6334]: https://gitlab.freedesktop.org/drm/intel/issues/6334
[i915#6335]: https://gitlab.freedesktop.org/drm/intel/issues/6335
[i915#6412]: https://gitlab.freedesktop.org/drm/intel/issues/6412
[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#7052]: https://gitlab.freedesktop.org/drm/intel/issues/7052
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7651]: https://gitlab.freedesktop.org/drm/intel/issues/7651
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#7863]: https://gitlab.freedesktop.org/drm/intel/issues/7863
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
Build changes
-------------
* Linux: CI_DRM_12582 -> Patchwork_112801v2
* Piglit: piglit_4509 -> None
CI-20190529: 20190529
CI_DRM_12582: 312e96256f0520b8660750dd4fc937f63c2f359e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7119: 1e6d24e6dfa42b22f950f7d5e436b8f9acf8747f @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_112801v2: 312e96256f0520b8660750dd4fc937f63c2f359e @ 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_112801v2/index.html
[-- Attachment #2: Type: text/html, Size: 15795 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/selftests: Unwind hugepages to drop wakeref on error
2023-01-13 11:49 Nirmoy Das
2023-01-13 11:51 ` Matthew Auld
@ 2023-01-16 11:21 ` Andrzej Hajda
1 sibling, 0 replies; 11+ messages in thread
From: Andrzej Hajda @ 2023-01-16 11:21 UTC (permalink / raw)
To: Nirmoy Das, intel-gfx; +Cc: chris.p.wilson, matthew.auld, dri-devel
On 13.01.2023 12:49, 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.
>
> Signed-off-by: Chris Wilson <chris.p.wilson@linux.intel.com>
> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Regards
Andrzej
> ---
> drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 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..295d6f2cc4ff 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,7 +1871,7 @@ 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)) {
> @@ -1883,7 +1883,7 @@ static int igt_shrink_thp(void *arg)
>
> err = i915_vma_pin(vma, 0, 0, flags);
> if (err)
> - goto out_put;
> + goto out_wf;
>
> while (n--) {
> err = cpu_check(obj, n, 0xdeadbeaf);
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/selftests: Unwind hugepages to drop wakeref on error
2023-01-13 12:00 [Intel-gfx] [PATCH] drm/i915/selftests: Unwind hugepages to drop wakeref on error Nirmoy Das
2023-01-13 14:07 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/selftests: Unwind hugepages to drop wakeref on error (rev2) Patchwork
2023-01-13 21:52 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
@ 2023-01-16 18:49 ` Andi Shyti
2023-01-17 8:57 ` Das, Nirmoy
2 siblings, 1 reply; 11+ messages in thread
From: Andi Shyti @ 2023-01-16 18:49 UTC (permalink / raw)
To: Nirmoy Das; +Cc: dri-devel, intel-gfx, stable, matthew.auld, chris.p.wilson
Hi Nirmoy,
On Fri, Jan 13, 2023 at 01:00:53PM +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.
>
> Fixes: 027c38b4121e ("drm/i915/selftests: Grab the runtime pm in shrink_thp")
> Reviewed-by: Matthew Auld <matthew.auld@intel.com>
> Signed-off-by: Chris Wilson <chris.p.wilson@linux.intel.com>
> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
> Cc: <stable@vger.kernel.org> # v6.0+
> ---
> drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 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..295d6f2cc4ff 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,7 +1871,7 @@ 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;
> }
aren't we missing here one out_put -> out_wf change?
This one:
@@ -1878,7 +1878,7 @@ static int igt_shrink_thp(void *arg)
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);
Andi
>
> if (should_swap == (obj->mm.page_sizes.sg || obj->mm.page_sizes.phys)) {
> @@ -1883,7 +1883,7 @@ static int igt_shrink_thp(void *arg)
>
> 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] 11+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/selftests: Unwind hugepages to drop wakeref on error
2023-01-16 18:49 ` [Intel-gfx] [PATCH] drm/i915/selftests: Unwind hugepages to drop wakeref on error Andi Shyti
@ 2023-01-17 8:57 ` Das, Nirmoy
0 siblings, 0 replies; 11+ messages in thread
From: Das, Nirmoy @ 2023-01-17 8:57 UTC (permalink / raw)
To: Andi Shyti, Nirmoy Das
Cc: intel-gfx, chris.p.wilson, stable, dri-devel, matthew.auld
On 1/16/2023 7:49 PM, Andi Shyti wrote:
> Hi Nirmoy,
>
> On Fri, Jan 13, 2023 at 01:00:53PM +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.
>>
>> Fixes: 027c38b4121e ("drm/i915/selftests: Grab the runtime pm in shrink_thp")
>> Reviewed-by: Matthew Auld <matthew.auld@intel.com>
>> Signed-off-by: Chris Wilson <chris.p.wilson@linux.intel.com>
>> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
>> Cc: <stable@vger.kernel.org> # v6.0+
>> ---
>> drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 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..295d6f2cc4ff 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,7 +1871,7 @@ 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;
>> }
> aren't we missing here one out_put -> out_wf change?
>
> This one:
>
> @@ -1878,7 +1878,7 @@ static int igt_shrink_thp(void *arg)
> pr_err("unexpected residual page-size bits, should_swap=%s\n",
> str_yes_no(should_swap));
> err = -EINVAL;
> - goto out_put;
> + goto out_wf;
Thanks for catching this. Yes, we need this too. I will resend.
Nirmoy
> }
>
> err = i915_vma_pin(vma, 0, 0, flags);
>
> Andi
>
>>
>> if (should_swap == (obj->mm.page_sizes.sg || obj->mm.page_sizes.phys)) {
>> @@ -1883,7 +1883,7 @@ static int igt_shrink_thp(void *arg)
>>
>> 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] 11+ messages in thread
end of thread, other threads:[~2023-01-17 8:57 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-13 12:00 [Intel-gfx] [PATCH] drm/i915/selftests: Unwind hugepages to drop wakeref on error Nirmoy Das
2023-01-13 14:07 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/selftests: Unwind hugepages to drop wakeref on error (rev2) Patchwork
2023-01-13 21:52 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2023-01-16 18:49 ` [Intel-gfx] [PATCH] drm/i915/selftests: Unwind hugepages to drop wakeref on error Andi Shyti
2023-01-17 8:57 ` Das, Nirmoy
-- strict thread matches above, loose matches on Subject: below --
2023-01-13 11:49 Nirmoy Das
2023-01-13 11:51 ` Matthew Auld
2023-01-13 12:02 ` Das, Nirmoy
2023-01-13 12:05 ` Matthew Auld
2023-01-13 12:07 ` Das, Nirmoy
2023-01-16 11:21 ` Andrzej Hajda
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox