From: "Sebastian Brzezinka" <sebastian.brzezinka@intel.com>
To: Andi Shyti <andi.shyti@kernel.org>,
Sebastian Brzezinka <sebastian.brzezinka@intel.com>
Cc: Krzysztof Karas <krzysztof.karas@intel.com>,
<intel-gfx@lists.freedesktop.org>, <andi.shyti@linux.intel.com>,
<chris.p.wilson@intel.com>, <krzysztof.niemiec@intel.com>
Subject: Re: [PATCH v6 3/3] drm/i915/selftests: take error_mutex in stolen reset test
Date: Thu, 19 Nov 2026 12:06:59 +0100 [thread overview]
Message-ID: <DMZ510W56JPY.Y80JF2RM7J44@intel.com> (raw)
In-Reply-To: <av7WNeQtujfjHyWn@zenone.zhora.eu>
On Thu Nov 19, 2026 at 11:58 AM CET, Andi Shyti wrote:
> Hi Sebastian,
>
>> >> diff --git a/drivers/gpu/drm/i915/gt/selftest_reset.c b/drivers/gpu/drm/i915/gt/selftest_reset.c
>> >> index 09a08a91e610..bd5876da6449 100644
>> >> --- a/drivers/gpu/drm/i915/gt/selftest_reset.c
>> >> +++ b/drivers/gpu/drm/i915/gt/selftest_reset.c
>> >> @@ -36,6 +36,8 @@ __igt_reset_stolen(struct intel_gt *gt,
>> >> intel_wakeref_t wakeref;
>> >> enum intel_engine_id id;
>> >> struct igt_spinner spin;
>> >> + void (*insert_page)(struct i915_address_space *vm, dma_addr_t addr,
>> >> + u64 offset, unsigned int pat_index, u32 flags);
>> >> long max, count;
>> >> void *tmp;
>> >> u32 *crc;
>> >> @@ -90,18 +92,19 @@ __igt_reset_stolen(struct intel_gt *gt,
>> >> i915_request_add(rq);
>> >> }
>> >>
>> >> + insert_page = ggtt->vm.raw_insert_page ?: ggtt->vm.insert_page;
>> > The explanation in commit message focuses on the locking itself,
>> > so changes to insert_page calling seem unrelated. Could you
>> > split it into another patch or, if it is required for this part
>> > to remain here, document it above?
>> raw_insert_page is needed because the test now calls insert_page
>> with error_mutex held. On Cherryview and on Broxton when VT-d is on,
>> insert_page uses stop_machine(), which can cause a lockdep warning.
>>
>> Should I send v7 with this added to the commit message, or can it be
>> included during the merge?
>
> no need! Please reply to this email with the new commit message.
>
> Thanks,
> Andi
drm/i915/selftests: take error_mutex in stolen reset test
The stolen reset test reads and writes stolen pages through the ggtt
error_capture slot, but it does not take ggtt->error_mutex. The DEBUG_GEM
poisoning of stolen pages, which runs from the object free worker, and
the GPU error capture use the same slot, and both take that mutex.
So the free worker can change the slot while the test is using it, and
part of its poison ends up in the page under test. The page then looks
partly like STACK_MAGIC and partly like POISON_INUSE/POISON_FREE, and the
test wrongly reports that the GPU reset modified stolen memory.
Take ggtt->error_mutex, nested inside stolen_lock, around each sampling
loop. Don't hold it across the reset, as the GuC CT worker can take it
from the error capture path while the reset flushes that worker.
Use raw_insert_page when available, as i915_vma_coredump_create() does.
On Cherryview and on Broxton when VT-d is on, insert_page uses
stop_machine(), which can cause a lockdep warning when called with
error_mutex held.
Signed-off-by: Sebastian Brzezinka <sebastian.brzezinka@intel.com>
--
Best regards,
Sebastian
next prev parent reply other threads:[~2026-11-19 11:07 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 13:02 [PATCH v6 0/3] drm/i915/selftests: fix stolen reset test races Sebastian Brzezinka
2026-11-18 13:02 ` [PATCH v6 1/3] drm/i915/selftests: Fix unlocked mm.stolen in reset selftest Sebastian Brzezinka
2026-11-18 13:31 ` sashiko-bot
2026-11-18 15:23 ` Krzysztof Karas
2026-11-19 10:32 ` Sebastian Brzezinka
2026-11-19 14:48 ` Krzysztof Karas
2026-11-19 15:07 ` Krzysztof Niemiec
2026-11-18 13:02 ` [PATCH v6 2/3] drm/i915/selftests: Limit stolen reset test to usable stolen Sebastian Brzezinka
2026-11-18 13:09 ` sashiko-bot
2026-11-18 15:24 ` Krzysztof Karas
2026-11-19 15:12 ` Krzysztof Niemiec
2026-11-18 13:02 ` [PATCH v6 3/3] drm/i915/selftests: take error_mutex in stolen reset test Sebastian Brzezinka
2026-11-18 13:13 ` sashiko-bot
2026-11-18 15:34 ` Krzysztof Karas
2026-11-19 10:45 ` Sebastian Brzezinka
2026-11-19 10:58 ` Andi Shyti
2026-11-19 11:06 ` Sebastian Brzezinka [this message]
2026-11-19 14:46 ` Krzysztof Karas
2026-11-19 15:11 ` Krzysztof Niemiec
2026-11-18 17:29 ` ✗ i915.CI.BAT: failure for drm/i915/selftests: fix stolen reset test races Patchwork
2026-11-19 8:26 ` ✓ i915.CI.BAT: success for drm/i915/selftests: fix stolen reset test races (rev2) Patchwork
2026-11-19 18:53 ` ✗ i915.CI.Full: 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=DMZ510W56JPY.Y80JF2RM7J44@intel.com \
--to=sebastian.brzezinka@intel.com \
--cc=andi.shyti@kernel.org \
--cc=andi.shyti@linux.intel.com \
--cc=chris.p.wilson@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=krzysztof.karas@intel.com \
--cc=krzysztof.niemiec@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: 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