From: Nirmoy Das <nirmoy.das@intel.com>
To: Andrzej Hajda <andrzej.hajda@intel.com>,
<intel-gfx@lists.freedesktop.org>
Cc: "Tvrtko Ursulin" <tvrtko.ursulin@linux.intel.com>,
"Thomas Hellström" <thomas.hellstrom@linux.intel.com>,
"Chris Wilson" <chris.p.wilson@intel.com>,
dri-devel@lists.freedesktop.org,
"Andi Shyti" <andi.shyti@linux.intel.com>,
"Rodrigo Vivi" <rodrigo.vivi@intel.com>,
"Sushma Venkatesh Reddy" <sushma.venkatesh.reddy@intel.com>
Subject: Re: [PATCH v2] drm/i915: Fix a VMA UAF for multi-gt platform
Date: Wed, 7 Jun 2023 09:46:01 +0200 [thread overview]
Message-ID: <67a00902-0cad-7138-97c1-bb044f81f7a8@intel.com> (raw)
In-Reply-To: <f125ef17-631f-17db-7b8f-b6e6f0a75429@intel.com>
On 6/7/2023 8:20 AM, Andrzej Hajda wrote:
>
>
> On 06.06.2023 22:27, Nirmoy Das wrote:
>> Ensure correct handling of closed VMAs on multi-gt platforms to prevent
>> Use-After-Free. Currently, when GT0 goes idle, closed VMAs that are
>> exclusively added to GT0's closed_vma link (gt->closed_vma) and
>> subsequently freed by i915_vma_parked(), which assumes the entire GPU is
>> idle. However, on platforms with multiple GTs, such as MTL, GT1 may
>> remain active while GT0 is idle. This causes GT0 to mistakenly consider
>> the closed VMAs in its closed_vma list as unnecessary, potentially
>> leading to Use-After-Free issues if a job for GT1 attempts to access a
>> freed VMA.
>>
>> Although we do take a wakeref for GT0 but it happens later, after
>> evaluating VMAs. To mitigate this, it is necessary to hold a GT0 wakeref
>> early.
>>
>> v2: Use gt id to detect multi-tile(Andi)
>> Fix the incorrect error path.
>>
>> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
>> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
>> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
>> Cc: Thomas Hellström <thomas.hellstrom@linux.intel.com>
>> Cc: Chris Wilson <chris.p.wilson@intel.com>
>> Cc: Andi Shyti <andi.shyti@linux.intel.com>
>> Cc: Andrzej Hajda <andrzej.hajda@intel.com>
>> Cc: Sushma Venkatesh Reddy <sushma.venkatesh.reddy@intel.com>
>> Tested-by: Andi Shyti <andi.shyti@linux.intel.com>
>> Signed-off-by: Nirmoy Das <nirmoy.das@intel.com>
>> ---
>> drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 12 ++++++++++++
>> 1 file changed, 12 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
>> b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
>> index 3aeede6aee4d..c2a67435acfa 100644
>> --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
>> @@ -2683,6 +2683,7 @@ static int
>> eb_select_engine(struct i915_execbuffer *eb)
>> {
>> struct intel_context *ce, *child;
>> + struct intel_gt *gt;
>> unsigned int idx;
>> int err;
>> @@ -2706,10 +2707,16 @@ eb_select_engine(struct i915_execbuffer *eb)
>> }
>> }
>> eb->num_batches = ce->parallel.number_children + 1;
>> + gt = ce->engine->gt;
>> for_each_child(ce, child)
>> intel_context_get(child);
>> intel_gt_pm_get(ce->engine->gt);
>
> intel_gt_pm_get(gt)
>
>
>> + /* Keep GT0 active on MTL so that i915_vma_parked() doesn't
>> + * free VMAs while execbuf ioctl is validating VMAs.
>> + */
>> + if (gt->info.id)
>> + intel_gt_pm_get(to_gt(gt->i915));
>> if (!test_bit(CONTEXT_ALLOC_BIT, &ce->flags)) {
>> err = intel_context_alloc_state(ce);
>> @@ -2748,6 +2755,9 @@ eb_select_engine(struct i915_execbuffer *eb)
>> return err;
>> err:
>> + if (gt->info.id)
>> + intel_gt_pm_put(to_gt(gt->i915));
>> +
>> intel_gt_pm_put(ce->engine->gt);
>
> intel_gt_pm_put(gt)
>
Will change both.
>
> Reviewed-by: Andrzej Hajda <andrzej.hajda@intel.com>
Thanks,
Nirmoy
>
> Regards
> Andrzej
>
>> for_each_child(ce, child)
>> intel_context_put(child);
>> @@ -2761,6 +2771,8 @@ eb_put_engine(struct i915_execbuffer *eb)
>> struct intel_context *child;
>> i915_vm_put(eb->context->vm);
>> + if (eb->gt->info.id)
>> + intel_gt_pm_put(to_gt(eb->gt->i915));
>> intel_gt_pm_put(eb->gt);
>> for_each_child(eb->context, child)
>> intel_context_put(child);
>
prev parent reply other threads:[~2023-06-07 7:46 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-06 20:27 [PATCH v2] drm/i915: Fix a VMA UAF for multi-gt platform Nirmoy Das
2023-06-06 20:56 ` Andi Shyti
2023-06-07 7:44 ` Nirmoy Das
2023-06-07 6:20 ` Andrzej Hajda
2023-06-07 7:46 ` Nirmoy Das [this message]
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=67a00902-0cad-7138-97c1-bb044f81f7a8@intel.com \
--to=nirmoy.das@intel.com \
--cc=andi.shyti@linux.intel.com \
--cc=andrzej.hajda@intel.com \
--cc=chris.p.wilson@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=rodrigo.vivi@intel.com \
--cc=sushma.venkatesh.reddy@intel.com \
--cc=thomas.hellstrom@linux.intel.com \
--cc=tvrtko.ursulin@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: 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;
as well as URLs for NNTP newsgroup(s).