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 06/33] drm/ttm: Add fault injection for beneficial-order allocation failures
Date: Thu, 19 Nov 2026 12:49:20 -0800 [thread overview]
Message-ID: <av9g0IzQtppjI7Xd@gsse-cloud1.jf.intel.com> (raw)
In-Reply-To: <au1BdOeD319qwsYa@nvishwa1-desk>
On Thu, Nov 05, 2026 at 06:54:44PM -0800, Niranjana Vishwanathapura wrote:
> On Fri, Jul 10, 2026 at 07:55:52PM -0700, Matthew Brost wrote:
> > Add a beneficial_order_fault_inject debugfs fault attribute, mirroring
> > backup_fault_inject, that forces allocation at (or above) the device's
> > beneficial order to fail in __ttm_pool_alloc(). When triggered, both the
> > pool take and the system page allocation are skipped for that order, so
> > the allocation falls into the existing lower-the-order path that sets
> > the TTM_TT_FLAG_BENEFICIAL_ORDER_FAILED tt page flag (and bails out with
> > -ENOMEM for defrag moves).
> >
> > This lets the TTM_TT_FLAG_BENEFICIAL_ORDER_FAILED tracking and the
> > driver-side defrag path be exercised deterministically, without having to
> > drive the system into real memory fragmentation to provoke a sub-optimal
> > backing.
> >
> > The knob is registered at
> > /sys/kernel/debug/ttm/beneficial_order_fault_inject and compiles out
> > when CONFIG_FAULT_INJECTION is disabled.
> >
> > 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 | 35 ++++++++++++++++++++++++++++------
> > 1 file changed, 29 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/ttm/ttm_pool.c b/drivers/gpu/drm/ttm/ttm_pool.c
> > index d045105afc24..2598d2f33767 100644
> > --- a/drivers/gpu/drm/ttm/ttm_pool.c
> > +++ b/drivers/gpu/drm/ttm/ttm_pool.c
> > @@ -53,6 +53,7 @@
> > #ifdef CONFIG_FAULT_INJECTION
> > #include <linux/fault-inject.h>
> > static DECLARE_FAULT_ATTR(backup_fault_inject);
> > +static DECLARE_FAULT_ATTR(beneficial_order_fault_inject);
> > #else
> > #define should_fail(...) false
> > #endif
> > @@ -812,21 +813,34 @@ struct ttm_pool_alloc_iter {
> > unsigned int order;
> > enum ttm_caching page_caching;
> > bool allow_pools;
> > + bool fail_beneficial;
> > 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.
> > + * failure). Tries a same-order pool page, then a fresh system allocation. Fault
> > + * injection can force the beneficial-order paths to "fail".
> > */
> > 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;
> > +
> > + /*
> > + * Fault injection: pretend allocation at (or above) the device's
> > + * beneficial order failed, forcing a sub-optimal backing. Exercises the
> > + * beneficial_order_failed tracking and the driver defrag path without
> > + * driving the system into real fragmentation.
> > + */
> > + it->fail_beneficial = IS_ENABLED(CONFIG_FAULT_INJECTION) &&
> > + it->beneficial_order && it->order >= it->beneficial_order &&
> > + should_fail(&beneficial_order_fault_inject, 1);
>
> NIT..Looks like IS_ENABLED(CONFIG_FAULT_INJECTION) check here is redundant,
> but other fault inject case is also using it, so, should be fine I guess.
>
I believe the thinking is immediate short circuit on a static Kconfig so
the compiler can optimize all of this out. Maybe it should_fail is
enough but following the style that exists in this file for other
injection points.
Matt
> This patch LGTM.
>
> Niranjana
>
> > +
> > + /* First, try to allocate a page from a pool if one exists. */
> > pt = ttm_pool_select_type(it->pool, it->page_caching, it->order);
> > - if (!it->p && pt && it->allow_pools)
> > + if (!it->p && pt && it->allow_pools && !it->fail_beneficial)
> > it->p = ttm_pool_type_take(pt, ttm_pool_nid(it->pool));
> >
> > /*
> > @@ -834,7 +848,7 @@ static void ttm_pool_iter_acquire_page(struct ttm_pool_alloc_iter *it)
> > * this also disallows additional pool allocations using write-back
> > * cached pools of the same order.
> > */
> > - if (!it->p) {
> > + if (!it->p && !it->fail_beneficial) {
> > it->page_caching = ttm_cached;
> > it->allow_pools = false;
> > it->p = ttm_pool_alloc_page(it->pool, it->gfp_flags, it->order,
> > @@ -851,6 +865,9 @@ static void ttm_pool_iter_acquire_page(struct ttm_pool_alloc_iter *it)
> > */
> > static int ttm_pool_iter_lower_order(struct ttm_pool_alloc_iter *it)
> > {
> > + bool at_beneficial = it->beneficial_order &&
> > + it->order == it->beneficial_order;
> > +
> > if (!it->order)
> > return -ENOMEM;
> >
> > @@ -860,13 +877,16 @@ static int ttm_pool_iter_lower_order(struct ttm_pool_alloc_iter *it)
> > * 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) {
> > + if (it->fail_beneficial || at_beneficial) {
> > it->tt->page_flags |= TTM_TT_FLAG_BENEFICIAL_ORDER_FAILED;
> > if (it->ctx->defrag)
> > return -ENOMEM;
> > }
> >
> > - it->order--;
> > + if (it->fail_beneficial)
> > + it->order = it->beneficial_order - 1;
> > + else
> > + it->order--;
> > it->page_caching = it->tt->caching;
> > it->allow_pools = true;
> >
> > @@ -1536,6 +1556,9 @@ int ttm_pool_mgr_init(unsigned long num_pages)
> > #ifdef CONFIG_FAULT_INJECTION
> > fault_create_debugfs_attr("backup_fault_inject", ttm_debugfs_root,
> > &backup_fault_inject);
> > + fault_create_debugfs_attr("beneficial_order_fault_inject",
> > + ttm_debugfs_root,
> > + &beneficial_order_fault_inject);
> > #endif
> > #endif
> >
> > --
> > 2.34.1
> >
next prev parent reply other threads:[~2026-11-19 20:49 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
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 [this message]
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=av9g0IzQtppjI7Xd@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®