From: Matthew Brost <matthew.brost@intel.com>
To: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com>
Cc: intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
"Carlos Santa" <carlos.santa@intel.com>,
"Ryan Neph" <ryanneph@google.com>,
"Christian Koenig" <christian.koenig@amd.com>,
"Huang Rui" <ray.huang@amd.com>,
"Matthew Auld" <matthew.auld@intel.com>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"David Airlie" <airlied@gmail.com>,
"Simona Vetter" <simona@ffwll.ch>,
linux-kernel@vger.kernel.org,
"Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Subject: Re: [PATCH v3 04/33] drm/ttm: Introduce ttm_pool_alloc_iter for __ttm_pool_alloc()
Date: Thu, 19 Nov 2026 11:14:41 -0800 [thread overview]
Message-ID: <av9KoYw5cSdTfO8x@gsse-cloud1.jf.intel.com> (raw)
In-Reply-To: <au091GIzweGostC0@nvishwa1-desk>
On Thu, Nov 05, 2026 at 06:39:16PM -0800, Niranjana Vishwanathapura wrote:
> On Fri, Jul 10, 2026 at 07:55:50PM -0700, Matthew Brost wrote:
> > __ttm_pool_alloc() walks the page orders in a single loop whose body is
> > about to grow several defragmentation phases (reusing old pages, a move
> > budget, out-of-lock preallocation and fault injection). Left inline these
> > interleave into one deeply nested block of gotos and combinatorial
> > conditionals that is hard to follow and extend.
> >
> > Factor the loop's working state into a struct ttm_pool_alloc_iter and
> > pull the per-order page acquisition and order-fallback into small phase
> > helpers, so the main loop reads as a short sequence of named steps. This
> > is a pure refactor with no functional change; subsequent patches extend
> > the iterator with their defrag phases rather than nesting more logic into
> > the loop.
> >
> > Cc: Carlos Santa <carlos.santa@intel.com>
> > Cc: Ryan Neph <ryanneph@google.com>
> > Cc: Christian Koenig <christian.koenig@amd.com>
> > Cc: Huang Rui <ray.huang@amd.com>
> > Cc: Matthew Auld <matthew.auld@intel.com>
> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> > Cc: Maxime Ripard <mripard@kernel.org>
> > Cc: Thomas Zimmermann <tzimmermann@suse.de>
> > Cc: David Airlie <airlied@gmail.com>
> > Cc: Simona Vetter <simona@ffwll.ch>
> > Cc: dri-devel@lists.freedesktop.org
> > Cc: linux-kernel@vger.kernel.org
> > Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
> > Assisted-by: GitHub_Copilot:claude-opus-4.8
> > Signed-off-by: Matthew Brost <matthew.brost@intel.com>
> > ---
> > drivers/gpu/drm/ttm/ttm_pool.c | 159 ++++++++++++++++++++++-----------
> > 1 file changed, 106 insertions(+), 53 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.c
> > index e9175c0290d7..0ca63f5ce73c 100644
> > --- a/drivers/gpu/drm/ttm/ttm_pool.c
> > +++ b/drivers/gpu/drm/ttm/ttm_pool.c
> > @@ -791,18 +791,102 @@ static unsigned int ttm_pool_alloc_find_order(unsigned int highest,
> > return min_t(unsigned int, highest, __fls(alloc->remaining_pages));
> > }
> >
> > +/**
> > + * struct ttm_pool_alloc_iter - Working state for the __ttm_pool_alloc() loop
> > + *
> > + * Bundles the immutable inputs and the mutable per-order state that the
> > + * allocation phase helpers share, so the main loop reads as a short sequence
> > + * of named phases rather than one deeply nested block.
> > + */
> > +struct ttm_pool_alloc_iter {
> > + /* Immutable for the duration of the allocation. */
> > + struct ttm_pool *pool;
> > + struct ttm_tt *tt;
> > + const struct ttm_operation_ctx *ctx;
> > + struct ttm_pool_alloc_state *alloc;
> > + struct ttm_pool_tt_restore *restore;
> > + unsigned int beneficial_order;
> > + gfp_t gfp_flags;
> > +
> > + /* Mutated as the loop walks the orders. */
> > + unsigned int order;
> > + enum ttm_caching page_caching;
> > + bool allow_pools;
> > + struct page *p;
> > +};
> > +
> > +/*
> > + * Acquire a single page for the current order, leaving it in @it->p (NULL on
> > + * failure). Tries a same-order pool page, then a fresh system allocation.
> > + */
> > +static void ttm_pool_iter_acquire_page(struct ttm_pool_alloc_iter *it)
> > +{
> > + struct ttm_pool_type *pt;
> > +
> > + /* First, try to allocate a page from a pool if one exists. */
> > + it->p = NULL;
>
> NIT...Looks bit odd to set this to NULL here and check for '!ti->p' below.
> But I see subsequent patches add more code here, probably should be fine
> or add a temporary comment until then.
>
I'm not a huge fan of temporary comments and the structure does make
more sense in subsequent patches.
> > + pt = ttm_pool_select_type(it->pool, it->page_caching, it->order);
> > + if (!it->p && pt && it->allow_pools)
> > + it->p = ttm_pool_type_take(pt, ttm_pool_nid(it->pool));
> > +
> > + /*
> > + * If that fails or previously failed, allocate from system. Note that
> > + * this also disallows additional pool allocations using write-back
> > + * cached pools of the same order.
> > + */
> > + if (!it->p) {
> > + it->page_caching = ttm_cached;
> > + it->allow_pools = false;
> > + it->p = ttm_pool_alloc_page(it->pool, it->gfp_flags, it->order,
> > + it->ctx->beneficial_reclaim_backoff);
> > + }
> > +}
> > +
> > +/*
> > + * The current order could not be satisfied. Lower it and retry, recording a
> > + * sub-optimal backing (so the driver can later re-defrag) when we drop below
> > + * the beneficial order.
> > + *
> > + * Returns 0 to retry the (lowered) order, or a negative errno.
> > + */
> > +static int ttm_pool_iter_lower_order(struct ttm_pool_alloc_iter *it)
> > +{
> > + if (!it->order)
> > + return -ENOMEM;
> > +
> > + /*
> > + * Failing to allocate at the device's beneficial order means we are
> > + * about to back this object with a sub-optimal (smaller order) set of
> > + * pages. Record it so the driver can later try to defragment the object
> > + * back to beneficial order.
> > + */
> > + if (it->beneficial_order && it->order == it->beneficial_order)
> > + it->tt->page_flags |= TTM_TT_FLAG_BENEFICIAL_ORDER_FAILED;
> > +
> > + it->order--;
> > + it->page_caching = it->tt->caching;
> > + it->allow_pools = true;
> > +
> > + return 0;
> > +}
> > +
> > static int __ttm_pool_alloc(struct ttm_pool *pool, struct ttm_tt *tt,
> > const struct ttm_operation_ctx *ctx,
> > struct ttm_pool_alloc_state *alloc,
> > struct ttm_pool_tt_restore *restore)
> > {
> > - const unsigned int beneficial_order = ttm_pool_beneficial_order(pool);
> > - enum ttm_caching page_caching;
> > + struct ttm_pool_alloc_iter it = {
> > + .pool = pool,
> > + .tt = tt,
> > + .ctx = ctx,
> > + .alloc = alloc,
> > + .restore = restore,
> > + .beneficial_order = ttm_pool_beneficial_order(pool),
> > + .page_caching = tt->caching,
> > + .allow_pools = true,
> > + };
> > gfp_t gfp_flags = GFP_USER;
> > pgoff_t caching_divide;
> > - unsigned int order;
> > - bool allow_pools;
> > - struct page *p;
> > int r;
> >
> > WARN_ON(!alloc->remaining_pages || ttm_tt_is_populated(tt));
> > @@ -819,59 +903,28 @@ static int __ttm_pool_alloc(struct ttm_pool *pool, struct ttm_tt *tt,
> > else
> > gfp_flags |= GFP_HIGHUSER;
> >
> > - page_caching = tt->caching;
> > - allow_pools = true;
> > - for (order = ttm_pool_alloc_find_order(MAX_PAGE_ORDER, alloc);
> > + it.gfp_flags = gfp_flags;
> > +
> > + for (it.order = ttm_pool_alloc_find_order(MAX_PAGE_ORDER, alloc);
> > alloc->remaining_pages;
> > - order = ttm_pool_alloc_find_order(order, alloc)) {
> > - struct ttm_pool_type *pt;
> > -
> > - /* First, try to allocate a page from a pool if one exists. */
> > - p = NULL;
> > - pt = ttm_pool_select_type(pool, page_caching, order);
> > - if (pt && allow_pools)
> > - p = ttm_pool_type_take(pt, ttm_pool_nid(pool));
> > -
> > - /*
> > - * If that fails or previously failed, allocate from system.
> > - * Note that this also disallows additional pool allocations using
> > - * write-back cached pools of the same order. Consider removing
> > - * that behaviour.
> > - */
> > - if (!p) {
> > - page_caching = ttm_cached;
> > - allow_pools = false;
> > - p = ttm_pool_alloc_page(pool, gfp_flags, order,
> > - ctx->beneficial_reclaim_backoff);
> > - }
> > - /* If that fails, lower the order if possible and retry. */
> > - if (!p) {
> > - if (order) {
> > - /*
> > - * Failing to allocate at the device's beneficial
> > - * order means we are about to back this object
> > - * with a sub-optimal (smaller order) set of
> > - * pages. Record it so the driver can later try to
> > - * defragment the object back to beneficial order.
> > - */
> > - if (beneficial_order && order == beneficial_order)
> > - tt->page_flags |=
> > - TTM_TT_FLAG_BENEFICIAL_ORDER_FAILED;
> > - --order;
> > - page_caching = tt->caching;
> > - allow_pools = true;
> > - continue;
> > - }
> > - r = -ENOMEM;
> > - goto error_free_all;
> > + it.order = ttm_pool_alloc_find_order(it.order, alloc)) {
> > + /* Acquire a page (pool / system) for this order. */
> > + ttm_pool_iter_acquire_page(&it);
> > + if (!it.p) {
> > + r = ttm_pool_iter_lower_order(&it);
> > + if (r)
> > + goto error_free_all;
> > + continue;
> > }
> > - r = ttm_pool_page_allocated(pool, order, p, page_caching, alloc,
> > - restore);
> > +
> > + r = ttm_pool_page_allocated(pool, it.order, it.p,
> > + it.page_caching, alloc, restore);
>
> Looks like iterator has a 'restore' field that gets set, but it is not used here
> or in other places. Is that intended?
>
It is not intended. 'restore' should be not be in the iterator as it is
unused. Will remove.
Matt
> Other than above comments, the patch LGTM, though need to look into other patches
> in this series which makes use of this iterator.
>
> Niranjana
>
> > if (r)
> > goto error_free_page;
> >
> > if (ttm_pool_restore_valid(restore)) {
> > - r = ttm_pool_restore_commit(restore, tt->backup, ctx, alloc);
> > + r = ttm_pool_restore_commit(restore, tt->backup, ctx,
> > + alloc);
> > if (r)
> > goto error_free_all;
> > }
> > @@ -887,7 +940,7 @@ static int __ttm_pool_alloc(struct ttm_pool *pool, struct ttm_tt *tt,
> > return 0;
> >
> > error_free_page:
> > - ttm_pool_free_page(pool, page_caching, order, p, false);
> > + ttm_pool_free_page(pool, it.page_caching, it.order, it.p, false);
> >
> > error_free_all:
> > if (tt->restore)
> > --
> > 2.34.1
> >
next prev parent reply other threads:[~2026-11-19 19:14 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-11 2:55 [PATCH v3 00/33] drm/ttm, drm/xe: Minimize dma-resv hold times and defragment sub-optimally backed BOs Matthew Brost
2026-07-11 2:55 ` [PATCH v3 01/33] drm/ttm/pool: Allow backing off reclaim at the beneficial order Matthew Brost
2026-11-06 2:55 ` Niranjana Vishwanathapura
2026-11-19 18:47 ` Matthew Brost
2026-07-11 2:55 ` [PATCH v3 02/33] drm/ttm/pool: Add ttm_pool_page_order_nodma() helper Matthew Brost
2026-11-05 11:27 ` Matthew Auld
2026-11-06 2:30 ` Niranjana Vishwanathapura
2026-07-11 2:55 ` [PATCH v3 03/33] drm/ttm: Record sub-optimal page order allocations in ttm_tt Matthew Brost
2026-11-06 2:34 ` Niranjana Vishwanathapura
2026-11-06 20:06 ` Matthew Brost
2026-07-11 2:55 ` [PATCH v3 04/33] drm/ttm: Introduce ttm_pool_alloc_iter for __ttm_pool_alloc() Matthew Brost
2026-11-06 2:39 ` Niranjana Vishwanathapura
2026-11-19 19:14 ` Matthew Brost [this message]
2026-07-11 2:55 ` [PATCH v3 05/33] drm/ttm: Support defragmentation moves Matthew Brost
2026-11-06 2:51 ` Niranjana Vishwanathapura
2026-11-19 20:15 ` Matthew Brost
2026-07-11 2:55 ` [PATCH v3 06/33] drm/ttm: Add fault injection for beneficial-order allocation failures Matthew Brost
2026-11-06 2:54 ` Niranjana Vishwanathapura
2026-11-19 20:49 ` Matthew Brost
2026-07-11 2:55 ` [PATCH v3 07/33] drm/ttm: Harvest beneficial-order pages on defragmentation moves Matthew Brost
2026-11-10 2:37 ` Niranjana Vishwanathapura
2026-11-19 21:39 ` Matthew Brost
2026-07-11 2:55 ` [PATCH v3 08/33] drm/ttm: Bound page (re)allocation per defragmentation move Matthew Brost
2026-11-10 2:44 ` Niranjana Vishwanathapura
2026-07-11 2:55 ` [PATCH v3 09/33] drm/ttm: Preallocate beneficial-order defrag pages outside the lock Matthew Brost
2026-11-11 0:29 ` Niranjana Vishwanathapura
2026-11-11 7:49 ` Niranjana Vishwanathapura
2026-07-11 2:55 ` [PATCH v3 10/33] drm/ttm: Add full out-of-lock preallocation for ttm_pool_alloc() Matthew Brost
2026-11-11 7:31 ` Niranjana Vishwanathapura
2026-07-11 2:56 ` [PATCH v3 15/33] drm/xe: Track BOs backed at a sub-optimal page order Matthew Brost
2026-11-07 4:49 ` Niranjana Vishwanathapura
2026-07-11 2:56 ` [PATCH v3 16/33] drm/xe: Back off beneficial-order reclaim under defrag pressure Matthew Brost
2026-11-07 5:02 ` Niranjana Vishwanathapura
2026-07-11 2:56 ` [PATCH v3 17/33] drm/xe: Add xe_migrate_copy_defrag() for on-GPU defrag copies Matthew Brost
2026-11-03 12:58 ` Matthew Auld
2026-11-03 20:08 ` Matthew Brost
2026-11-04 12:37 ` Matthew Auld
2026-11-07 5:07 ` Niranjana Vishwanathapura
2026-07-11 2:56 ` [PATCH v3 18/33] drm/xe: Handle defrag moves in xe_bo_move() Matthew Brost
2026-11-07 5:12 ` Niranjana Vishwanathapura
2026-07-11 2:56 ` [PATCH v3 19/33] drm/xe: Skip self-copies for borrowed pages on defrag moves Matthew Brost
2026-11-10 4:25 ` Niranjana Vishwanathapura
2026-07-11 2:56 ` [PATCH v3 20/33] drm/xe: Add a page defragmentation worker Matthew Brost
2026-11-07 5:27 ` Niranjana Vishwanathapura
2026-07-11 2:56 ` [PATCH v3 21/33] drm/xe: Add defrag GT stats Matthew Brost
2026-11-09 1:10 ` Niranjana Vishwanathapura
2026-07-11 2:56 ` [PATCH v3 22/33] drm/xe: Add Kconfig.profile options for BO defrag configuration Matthew Brost
2026-11-09 1:31 ` Niranjana Vishwanathapura
2026-07-11 2:56 ` [PATCH v3 23/33] drm/xe: Defrag using out-of-lock page preallocation Matthew Brost
2026-11-11 0:39 ` Niranjana Vishwanathapura
2026-07-11 2:56 ` [PATCH v3 24/33] drm/xe: Add defrag profiling tracepoints Matthew Brost
2026-11-09 4:34 ` Niranjana Vishwanathapura
2026-07-11 2:56 ` [PATCH v3 25/33] drm/xe: Preallocate system BO backing outside the dma-resv lock Matthew Brost
2026-11-11 7:36 ` Niranjana Vishwanathapura
2026-07-11 2:56 ` [PATCH v3 26/33] drm/xe: Add tracepoint for xe_gem_create_ioctl Matthew Brost
2026-11-11 7:37 ` Niranjana Vishwanathapura
2026-07-11 2:56 ` [PATCH v3 27/33] drm/xe: Add IOVA-based xe_res_cursor variant Matthew Brost
2026-11-04 12:23 ` Matthew Auld
2026-11-13 6:14 ` Niranjana Vishwanathapura
2026-07-11 2:56 ` [PATCH v3 28/33] drm/xe: Use IOVA-based DMA mapping for eligible tt BOs Matthew Brost
2026-11-03 19:00 ` Matthew Auld
2026-11-03 20:21 ` Matthew Brost
2026-11-04 11:39 ` Matthew Auld
2026-11-05 3:04 ` Matthew Brost
2026-11-13 6:28 ` Niranjana Vishwanathapura
2026-11-13 20:09 ` Matthew Brost
2026-11-16 4:10 ` Niranjana Vishwanathapura
2026-07-11 2:56 ` [PATCH v3 29/33] drm/xe: Add per-device dependency scheduler for IOVA defrag finalize Matthew Brost
2026-11-14 1:47 ` Niranjana Vishwanathapura
2026-07-11 2:56 ` [PATCH v3 30/33] drm/xe: Add packed copy-step IOVA mapping for defrag Matthew Brost
2026-11-14 1:52 ` Niranjana Vishwanathapura
2026-07-11 2:56 ` [PATCH v3 31/33] drm/xe: Blit src-natural to dst-packed for defrag-IOVA copies Matthew Brost
2026-11-14 1:57 ` Niranjana Vishwanathapura
2026-11-16 0:41 ` Niranjana Vishwanathapura
2026-07-11 2:56 ` [PATCH v3 32/33] drm/xe: Finalize defrag-IOVA moves with post-copy job Matthew Brost
2026-11-14 2:02 ` Niranjana Vishwanathapura
2026-07-11 2:56 ` [PATCH v3 33/33] drm/amdgpu: Preallocate system BO pages outside the reservation lock Matthew Brost
2026-07-11 10:46 ` Christian König
2026-07-13 20:24 ` Matthew Brost
2026-07-14 9:17 ` Christian König
2026-07-14 15:15 ` Matthew Brost
2026-11-16 1:01 ` [PATCH v3 00/33] drm/ttm, drm/xe: Minimize dma-resv hold times and defragment sub-optimally backed BOs Niranjana Vishwanathapura
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=av9KoYw5cSdTfO8x@gsse-cloud1.jf.intel.com \
--to=matthew.brost@intel.com \
--cc=airlied@gmail.com \
--cc=carlos.santa@intel.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=matthew.auld@intel.com \
--cc=mripard@kernel.org \
--cc=niranjana.vishwanathapura@intel.com \
--cc=ray.huang@amd.com \
--cc=ryanneph@google.com \
--cc=simona@ffwll.ch \
--cc=thomas.hellstrom@linux.intel.com \
--cc=tzimmermann@suse.de \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®