<html>
  <head>
    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
  </head>
  <body>
    <p><br>
    </p>
    <div class="moz-cite-prefix">On 9/25/2023 7:10 PM, Nirmoy Das wrote:<br>
    </div>
    <blockquote type="cite"
      cite="mid:20230925171048.19245-1-nirmoy.das@intel.com">
      <pre class="moz-quote-pre" wrap="">From: Jonathan Cavitt <a class="moz-txt-link-rfc2396E" href="mailto:jonathan.cavitt@intel.com"><jonathan.cavitt@intel.com></a>

Where applicable, use for_each_gt instead of to_gt in the
i915_gem_shrinker functions to make them apply to more than just the
primary GT.  Specifically, this ensure i915_gem_shrink_all retires all
requests across all GTs, and this makes i915_gem_shrinker_vmap unmap
VMAs from all GTs.

v2: Pass correct GT to intel_gt_retire_requests(Andrzej).
v3: Remove unnecessary braces(Andi) </pre>
    </blockquote>
    eh I will resend the v2 with your r-b, Andi.<br>
    <pre class="panel-body test-result" style="box-sizing: border-box; overflow: auto; font-family: Menlo, Monaco, Consolas, "Courier New", monospace; font-size: 13px; display: block; padding: 15px; margin: 0px; line-height: 14.3px; color: rgb(51, 51, 51); word-break: break-all; overflow-wrap: break-word; background-color: white; border-width: 1px 0px 0px; border-top-style: solid; border-right-style: initial; border-bottom-style: initial; border-left-style: initial; border-top-color: rgb(221, 221, 221); border-right-color: initial; border-bottom-color: initial; border-left-color: initial; border-image: initial; border-radius: 0px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; font-weight: 400; letter-spacing: normal; orphans: 2; text-align: start; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial;">drivers/gpu/drm/i915/gem/i915_gem_shrinker.c: In function ‘i915_gem_shrink’:
drivers/gpu/drm/i915/gem/i915_gem_shrinker.c:152:5: error: suggest explicit braces to avoid ambiguous ‘else’ [-Werror=dangling-else]
  152 |  if (shrink & I915_SHRINK_ACTIVE)
      |     ^</pre>
    <blockquote type="cite"
      cite="mid:20230925171048.19245-1-nirmoy.das@intel.com">
      <pre class="moz-quote-pre" wrap="">

Signed-off-by: Jonathan Cavitt <a class="moz-txt-link-rfc2396E" href="mailto:jonathan.cavitt@intel.com"><jonathan.cavitt@intel.com></a>
Signed-off-by: Nirmoy Das <a class="moz-txt-link-rfc2396E" href="mailto:nirmoy.das@intel.com"><nirmoy.das@intel.com></a>
Reviewed-by: Andrzej Hajda <a class="moz-txt-link-rfc2396E" href="mailto:andrzej.hajda@intel.com"><andrzej.hajda@intel.com></a>
Reviewed-by: Andi Shyti <a class="moz-txt-link-rfc2396E" href="mailto:andi.shyti@linux.intel.com"><andi.shyti@linux.intel.com></a>
---
 drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 41 ++++++++++++--------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
index 214763942aa2..e79fcbdfab25 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_shrinker.c
@@ -14,6 +14,7 @@
 #include <linux/vmalloc.h>
 
 #include "gt/intel_gt_requests.h"
+#include "gt/intel_gt.h"
 
 #include "i915_trace.h"
 
@@ -119,7 +120,8 @@ i915_gem_shrink(struct i915_gem_ww_ctx *ww,
        intel_wakeref_t wakeref = 0;
        unsigned long count = 0;
        unsigned long scanned = 0;
-       int err = 0;
+       int err = 0, i = 0;
+       struct intel_gt *gt;
 
        /* CHV + VTD workaround use stop_machine(); need to trylock vm->mutex */
        bool trylock_vm = !ww && intel_vm_no_concurrent_access_wa(i915);
@@ -148,8 +150,9 @@ i915_gem_shrink(struct i915_gem_ww_ctx *ww,
         * contexts around longer than is necessary.
         */
        if (shrink & I915_SHRINK_ACTIVE)
-               /* Retire requests to unpin all idle contexts */
-               intel_gt_retire_requests(to_gt(i915));
+               for_each_gt(gt, i915, i)
+                       /* Retire requests to unpin all idle contexts */
+                       intel_gt_retire_requests(gt);
 
        /*
         * As we may completely rewrite the (un)bound list whilst unbinding
@@ -389,6 +392,8 @@ i915_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr
        struct i915_vma *vma, *next;
        unsigned long freed_pages = 0;
        intel_wakeref_t wakeref;
+       struct intel_gt *gt;
+       int i;
 
        with_intel_runtime_pm(&i915->runtime_pm, wakeref)
                freed_pages += i915_gem_shrink(NULL, i915, -1UL, NULL,
@@ -397,24 +402,26 @@ i915_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr
                                               I915_SHRINK_VMAPS);
 
        /* We also want to clear any cached iomaps as they wrap vmap */
-       mutex_lock(&to_gt(i915)->ggtt->vm.mutex);
-       list_for_each_entry_safe(vma, next,
-                                &to_gt(i915)->ggtt->vm.bound_list, vm_link) {
-               unsigned long count = i915_vma_size(vma) >> PAGE_SHIFT;
-               struct drm_i915_gem_object *obj = vma->obj;
-
-               if (!vma->iomap || i915_vma_is_active(vma))
-                       continue;
+       for_each_gt(gt, i915, i) {
+               mutex_lock(&gt->ggtt->vm.mutex);
+               list_for_each_entry_safe(vma, next,
+                                        &gt->ggtt->vm.bound_list, vm_link) {
+                       unsigned long count = i915_vma_size(vma) >> PAGE_SHIFT;
+                       struct drm_i915_gem_object *obj = vma->obj;
+
+                       if (!vma->iomap || i915_vma_is_active(vma))
+                               continue;
 
-               if (!i915_gem_object_trylock(obj, NULL))
-                       continue;
+                       if (!i915_gem_object_trylock(obj, NULL))
+                               continue;
 
-               if (__i915_vma_unbind(vma) == 0)
-                       freed_pages += count;
+                       if (__i915_vma_unbind(vma) == 0)
+                               freed_pages += count;
 
-               i915_gem_object_unlock(obj);
+                       i915_gem_object_unlock(obj);
+               }
+               mutex_unlock(&gt->ggtt->vm.mutex);
        }
-       mutex_unlock(&to_gt(i915)->ggtt->vm.mutex);
 
        *(unsigned long *)ptr += freed_pages;
        return NOTIFY_DONE;
</pre>
    </blockquote>
  </body>
</html>