From: Matthew Auld <matthew.auld@intel.com> To: intel-gfx@lists.freedesktop.org Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, dri-devel@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 12/20] drm/i915/ttm: make eviction mappable aware Date: Wed, 26 Jan 2022 15:21:47 +0000 [thread overview] Message-ID: <20220126152155.3070602-13-matthew.auld@intel.com> (raw) In-Reply-To: <20220126152155.3070602-1-matthew.auld@intel.com> If we need to make room for some some mappable object, then we should only victimize objects that have one or pages that occupy the visible portion of LMEM. Let's also create a new priority hint for objects that are placed in mappable memory, where we know that CPU access was requested, that way we hopefully victimize these last. Signed-off-by: Matthew Auld <matthew.auld@intel.com> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> --- drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 65 ++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c index e4cd6ccf5ab1..8376e4c3d290 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c @@ -5,8 +5,10 @@ #include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_placement.h> +#include <drm/drm_buddy.h> #include "i915_drv.h" +#include "i915_ttm_buddy_manager.h" #include "intel_memory_region.h" #include "intel_region_ttm.h" @@ -20,6 +22,7 @@ #define I915_TTM_PRIO_PURGE 0 #define I915_TTM_PRIO_NO_PAGES 1 #define I915_TTM_PRIO_HAS_PAGES 2 +#define I915_TTM_PRIO_NEEDS_CPU_ACCESS 3 /* * Size of struct ttm_place vector in on-stack struct ttm_placement allocs @@ -337,6 +340,7 @@ static bool i915_ttm_eviction_valuable(struct ttm_buffer_object *bo, const struct ttm_place *place) { struct drm_i915_gem_object *obj = i915_ttm_to_gem(bo); + struct ttm_resource *res = bo->resource; if (!obj) return false; @@ -350,7 +354,48 @@ static bool i915_ttm_eviction_valuable(struct ttm_buffer_object *bo, return false; /* Will do for now. Our pinned objects are still on TTM's LRU lists */ - return i915_gem_object_evictable(obj); + if (!i915_gem_object_evictable(obj)) + return false; + + switch (res->mem_type) { + case TTM_PL_PRIV: { + struct ttm_resource_manager *man = + ttm_manager_type(bo->bdev, res->mem_type); + struct i915_ttm_buddy_resource *bman_res = + to_ttm_buddy_resource(res); + struct drm_buddy *mm = bman_res->mm; + struct drm_buddy_block *block; + + if (!place->fpfn && !place->lpfn) + return true; + + GEM_BUG_ON(!place->lpfn); + + /* + * If we just want something mappable then we can quickly check + * if the current victim resource is using any of the CPU + * visible portion. + */ + if (!place->fpfn && + place->lpfn == i915_ttm_buddy_man_visible_size(man)) + return bman_res->used_visible_size > 0; + + /* Real range allocation */ + list_for_each_entry(block, &bman_res->blocks, link) { + unsigned long fpfn = + drm_buddy_block_offset(block) >> PAGE_SHIFT; + unsigned long lpfn = fpfn + + (drm_buddy_block_size(mm, block) >> PAGE_SHIFT); + + if (place->fpfn < lpfn && place->lpfn > fpfn) + return true; + } + return false; + } default: + break; + } + + return true; } static void i915_ttm_evict_flags(struct ttm_buffer_object *bo, @@ -850,7 +895,23 @@ void i915_ttm_adjust_lru(struct drm_i915_gem_object *obj) } else if (!i915_gem_object_has_pages(obj)) { bo->priority = I915_TTM_PRIO_NO_PAGES; } else { - bo->priority = I915_TTM_PRIO_HAS_PAGES; + struct ttm_resource_manager *man = + ttm_manager_type(bo->bdev, bo->resource->mem_type); + + /* + * If we need to place an LMEM resource which doesn't need CPU + * access then we should try not to victimize mappable objects + * first, since we likely end up stealing more of the mappable + * portion. And likewise when we try to find space for a mappble + * object, we know not to ever victimize objects that don't + * occupy any mappable pages. + */ + if (i915_ttm_cpu_maps_iomem(bo->resource) && + i915_ttm_buddy_man_visible_size(man) < man->size && + !(obj->flags & I915_BO_ALLOC_TOPDOWN)) + bo->priority = I915_TTM_PRIO_NEEDS_CPU_ACCESS; + else + bo->priority = I915_TTM_PRIO_HAS_PAGES; } ttm_bo_move_to_lru_tail(bo, bo->resource, NULL); -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Matthew Auld <matthew.auld@intel.com> To: intel-gfx@lists.freedesktop.org Cc: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>, dri-devel@lists.freedesktop.org Subject: [PATCH 12/20] drm/i915/ttm: make eviction mappable aware Date: Wed, 26 Jan 2022 15:21:47 +0000 [thread overview] Message-ID: <20220126152155.3070602-13-matthew.auld@intel.com> (raw) In-Reply-To: <20220126152155.3070602-1-matthew.auld@intel.com> If we need to make room for some some mappable object, then we should only victimize objects that have one or pages that occupy the visible portion of LMEM. Let's also create a new priority hint for objects that are placed in mappable memory, where we know that CPU access was requested, that way we hopefully victimize these last. Signed-off-by: Matthew Auld <matthew.auld@intel.com> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com> --- drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 65 ++++++++++++++++++++++++- 1 file changed, 63 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c index e4cd6ccf5ab1..8376e4c3d290 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c @@ -5,8 +5,10 @@ #include <drm/ttm/ttm_bo_driver.h> #include <drm/ttm/ttm_placement.h> +#include <drm/drm_buddy.h> #include "i915_drv.h" +#include "i915_ttm_buddy_manager.h" #include "intel_memory_region.h" #include "intel_region_ttm.h" @@ -20,6 +22,7 @@ #define I915_TTM_PRIO_PURGE 0 #define I915_TTM_PRIO_NO_PAGES 1 #define I915_TTM_PRIO_HAS_PAGES 2 +#define I915_TTM_PRIO_NEEDS_CPU_ACCESS 3 /* * Size of struct ttm_place vector in on-stack struct ttm_placement allocs @@ -337,6 +340,7 @@ static bool i915_ttm_eviction_valuable(struct ttm_buffer_object *bo, const struct ttm_place *place) { struct drm_i915_gem_object *obj = i915_ttm_to_gem(bo); + struct ttm_resource *res = bo->resource; if (!obj) return false; @@ -350,7 +354,48 @@ static bool i915_ttm_eviction_valuable(struct ttm_buffer_object *bo, return false; /* Will do for now. Our pinned objects are still on TTM's LRU lists */ - return i915_gem_object_evictable(obj); + if (!i915_gem_object_evictable(obj)) + return false; + + switch (res->mem_type) { + case TTM_PL_PRIV: { + struct ttm_resource_manager *man = + ttm_manager_type(bo->bdev, res->mem_type); + struct i915_ttm_buddy_resource *bman_res = + to_ttm_buddy_resource(res); + struct drm_buddy *mm = bman_res->mm; + struct drm_buddy_block *block; + + if (!place->fpfn && !place->lpfn) + return true; + + GEM_BUG_ON(!place->lpfn); + + /* + * If we just want something mappable then we can quickly check + * if the current victim resource is using any of the CPU + * visible portion. + */ + if (!place->fpfn && + place->lpfn == i915_ttm_buddy_man_visible_size(man)) + return bman_res->used_visible_size > 0; + + /* Real range allocation */ + list_for_each_entry(block, &bman_res->blocks, link) { + unsigned long fpfn = + drm_buddy_block_offset(block) >> PAGE_SHIFT; + unsigned long lpfn = fpfn + + (drm_buddy_block_size(mm, block) >> PAGE_SHIFT); + + if (place->fpfn < lpfn && place->lpfn > fpfn) + return true; + } + return false; + } default: + break; + } + + return true; } static void i915_ttm_evict_flags(struct ttm_buffer_object *bo, @@ -850,7 +895,23 @@ void i915_ttm_adjust_lru(struct drm_i915_gem_object *obj) } else if (!i915_gem_object_has_pages(obj)) { bo->priority = I915_TTM_PRIO_NO_PAGES; } else { - bo->priority = I915_TTM_PRIO_HAS_PAGES; + struct ttm_resource_manager *man = + ttm_manager_type(bo->bdev, bo->resource->mem_type); + + /* + * If we need to place an LMEM resource which doesn't need CPU + * access then we should try not to victimize mappable objects + * first, since we likely end up stealing more of the mappable + * portion. And likewise when we try to find space for a mappble + * object, we know not to ever victimize objects that don't + * occupy any mappable pages. + */ + if (i915_ttm_cpu_maps_iomem(bo->resource) && + i915_ttm_buddy_man_visible_size(man) < man->size && + !(obj->flags & I915_BO_ALLOC_TOPDOWN)) + bo->priority = I915_TTM_PRIO_NEEDS_CPU_ACCESS; + else + bo->priority = I915_TTM_PRIO_HAS_PAGES; } ttm_bo_move_to_lru_tail(bo, bo->resource, NULL); -- 2.34.1
next prev parent reply other threads:[~2022-01-26 15:22 UTC|newest] Thread overview: 105+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-01-26 15:21 [PATCH 00/20] Initial support for small BAR recovery Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-01-26 15:21 ` [PATCH 01/20] drm: improve drm_buddy_alloc function Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-01-26 18:03 ` Jani Nikula 2022-01-26 15:21 ` [PATCH 02/20] drm: implement top-down allocation method Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-01-26 18:42 ` Robert Beckett 2022-01-26 15:21 ` [PATCH 03/20] drm: implement a method to free unused pages Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-01-26 15:21 ` [PATCH 04/20] drm/i915: add io_size plumbing Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-01-31 15:14 ` Thomas Hellström 2022-01-31 15:14 ` [Intel-gfx] " Thomas Hellström 2022-01-26 15:21 ` [PATCH 05/20] drm/i915/ttm: require mappable by default Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-01-26 15:21 ` [PATCH 06/20] drm/i915: add I915_BO_ALLOC_TOPDOWN Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-01-31 15:28 ` Thomas Hellström 2022-01-31 15:28 ` [Intel-gfx] " Thomas Hellström 2022-01-31 15:49 ` Matthew Auld 2022-01-31 15:49 ` [Intel-gfx] " Matthew Auld 2022-01-26 15:21 ` [PATCH 07/20] drm/i915/buddy: track available visible size Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-01-31 16:12 ` Thomas Hellström 2022-01-31 16:12 ` [Intel-gfx] " Thomas Hellström 2022-01-26 15:21 ` [PATCH 08/20] drm/i915/buddy: adjust res->start Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-02-01 10:38 ` Thomas Hellström 2022-02-01 10:38 ` [Intel-gfx] " Thomas Hellström 2022-01-26 15:21 ` [PATCH 09/20] drm/i915/buddy: tweak 2big check Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-02-01 10:39 ` Thomas Hellström 2022-02-01 10:39 ` [Intel-gfx] " Thomas Hellström 2022-01-26 15:21 ` [Intel-gfx] [PATCH 10/20] drm/i915/selftests: mock test io_size Matthew Auld 2022-01-26 15:21 ` Matthew Auld 2022-02-02 10:24 ` Thomas Hellström 2022-02-02 10:24 ` [Intel-gfx] " Thomas Hellström 2022-01-26 15:21 ` [PATCH 11/20] drm/i915/ttm: tweak priority hint selection Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-02-02 13:34 ` Thomas Hellström 2022-02-02 13:34 ` [Intel-gfx] " Thomas Hellström 2022-01-26 15:21 ` Matthew Auld [this message] 2022-01-26 15:21 ` [PATCH 12/20] drm/i915/ttm: make eviction mappable aware Matthew Auld 2022-02-02 13:41 ` Thomas Hellström 2022-02-02 13:41 ` [Intel-gfx] " Thomas Hellström 2022-01-26 15:21 ` [PATCH 13/20] drm/i915/ttm: mappable migration on fault Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-02-03 7:59 ` Thomas Hellström 2022-02-03 7:59 ` [Intel-gfx] " Thomas Hellström 2022-01-26 15:21 ` [Intel-gfx] [PATCH 14/20] drm/i915/selftests: exercise mmap migration Matthew Auld 2022-01-26 15:21 ` Matthew Auld 2022-02-03 9:01 ` Thomas Hellström 2022-02-03 9:01 ` [Intel-gfx] " Thomas Hellström 2022-02-03 9:12 ` Matthew Auld 2022-02-03 9:12 ` [Intel-gfx] " Matthew Auld 2022-01-26 15:21 ` [PATCH 15/20] drm/i915/selftests: handle allocation failures Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-02-03 9:05 ` Thomas Hellström 2022-02-03 9:05 ` [Intel-gfx] " Thomas Hellström 2022-02-03 9:11 ` Matthew Auld 2022-02-03 9:11 ` [Intel-gfx] " Matthew Auld 2022-01-26 15:21 ` [PATCH 16/20] drm/i915/create: apply ALLOC_TOPDOWN by default Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-02-03 9:17 ` Thomas Hellström 2022-02-03 9:17 ` [Intel-gfx] " Thomas Hellström 2022-02-03 9:32 ` Matthew Auld 2022-02-03 9:32 ` [Intel-gfx] " Matthew Auld 2022-01-26 15:21 ` [PATCH 17/20] drm/i915/uapi: add NEEDS_CPU_ACCESS hint Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-02-03 9:28 ` Thomas Hellström 2022-02-03 9:28 ` [Intel-gfx] " Thomas Hellström 2022-02-03 11:38 ` Matthew Auld 2022-02-03 11:38 ` [Intel-gfx] " Matthew Auld 2022-02-03 13:29 ` Thomas Hellström 2022-02-03 13:29 ` [Intel-gfx] " Thomas Hellström 2022-01-26 15:21 ` [PATCH 18/20] drm/i915/uapi: forbid ALLOC_TOPDOWN for error capture Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-01-26 19:42 ` kernel test robot 2022-01-26 19:42 ` kernel test robot 2022-01-26 20:03 ` kernel test robot 2022-01-26 20:03 ` kernel test robot 2022-01-26 20:03 ` kernel test robot 2022-02-03 9:43 ` Thomas Hellström 2022-02-03 9:43 ` [Intel-gfx] " Thomas Hellström 2022-02-03 9:44 ` Matthew Auld 2022-02-03 9:44 ` [Intel-gfx] " Matthew Auld 2022-01-26 15:21 ` [PATCH 19/20] drm/i915/lmem: don't treat small BAR as an error Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-02-03 9:48 ` Thomas Hellström 2022-02-03 9:48 ` [Intel-gfx] " Thomas Hellström 2022-02-03 11:18 ` Matthew Auld 2022-02-03 11:18 ` [Intel-gfx] " Matthew Auld 2022-02-03 13:56 ` Thomas Hellström 2022-02-03 13:56 ` [Intel-gfx] " Thomas Hellström 2022-02-03 14:09 ` Matthew Auld 2022-02-03 14:09 ` [Intel-gfx] " Matthew Auld 2022-01-26 15:21 ` [PATCH 20/20] HAX: DG1 small BAR Matthew Auld 2022-01-26 15:21 ` [Intel-gfx] " Matthew Auld 2022-01-26 21:07 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Initial support for small BAR recovery Patchwork 2022-01-26 21:08 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2022-01-26 21:41 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork 2022-01-27 16:27 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Initial support for small BAR recovery (rev2) Patchwork 2022-01-27 16:28 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2022-01-27 16:57 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220126152155.3070602-13-matthew.auld@intel.com \ --to=matthew.auld@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=thomas.hellstrom@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.