drm/i915/selftests: Unwind hugepages to drop wakeref on error
Subsystems (2)
PATCH 1/1 drm/i915/selftests: Unwind hugepages to drop wakeref on error
From: Chris Wilson <[email protected]>
Make sure that upon error after we have acquired the wakeref we do release it again.
--- drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gem/selftests/huge_pages.c +3 -3
@@ -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 );
Signature · 1 line
2.39.0
Quoted 7 lines · Nirmoy Das
From: Chris Wilson <[email protected]>
Make sure that upon error after we have acquired the wakeref we do release it again.
Signed-off-by Chris Wilson <[email protected]>Signed-off-by Nirmoy Das <[email protected]>
Thanks Matt, I missed the Fixes tag so resent it with fixes and Cc to stable.
Quoted 9 lines · Matthew Auld
Quoted 7 lines · Nirmoy Das
From: Chris Wilson <[email protected]>
Make sure that upon error after we have acquired the wakeref we do release it again.
Signed-off-by Chris Wilson <[email protected]>Signed-off-by Nirmoy Das <[email protected]>Reviewed-by Matthew Auld <[email protected]>
Quoted 1 line · Nirmoy
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.
Quoted 11 lines · Matthew Auld
Quoted 9 lines · Nirmoy Das
Quoted 7 lines
From: Chris Wilson <[email protected]>
Make sure that upon error after we have acquired the wakeref we do release it again.
Signed-off-by Chris Wilson <[email protected]>Signed-off-by Nirmoy Das <[email protected]>Reviewed-by Matthew Auld <[email protected]>
Quoted 4 lines · Matthew Auld
Quoted 1 line · Nirmoy
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
Quoted 12 lines
Quoted 12 lines · Matthew Auld
Quoted 9 lines · Nirmoy Das
Quoted 7 lines
From: Chris Wilson <[email protected]>
Make sure that upon error after we have acquired the wakeref we do release it again.
Signed-off-by Chris Wilson <[email protected]>Signed-off-by Nirmoy Das <[email protected]>Reviewed-by Matthew Auld <[email protected]>
Quoted 7 lines · Nirmoy Das
From: Chris Wilson <[email protected]>
Make sure that upon error after we have acquired the wakeref we do release it again.
Signed-off-by Chris Wilson <[email protected]>Signed-off-by Nirmoy Das <[email protected]>
Regards
Andrzej
Quoted 35 lines
--- drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/gem/selftests/huge_pages.c +3
-3@@ -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 );