| Message ID | 20240305143747.335367-8-janusz.krzysztofik@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: Fix VMA UAF on destroy against deactivate race | expand |
On 3/5/2024 3:35 PM, Janusz Krzysztofik wrote: > This reverts commit 7a2280e8dcd2f1f436db9631287c0b21cf6a92b0, obsoleted > by "drm/i915/vma: Fix UAF on destroy against retire race". > > Signed-off-by: Janusz Krzysztofik<janusz.krzysztofik@linux.intel.com> > Cc: Nirmoy Das<nirmoy.das@intel.com> Reviewed-by: Nirmoy Das <nirmoy.das@intel.com> > --- > drivers/gpu/drm/i915/i915_vma.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c > index b70715b1411d6..d2f064d2525cc 100644 > --- a/drivers/gpu/drm/i915/i915_vma.c > +++ b/drivers/gpu/drm/i915/i915_vma.c > @@ -1776,8 +1776,6 @@ static void release_references(struct i915_vma *vma, struct intel_gt *gt, > if (vm_ddestroy) > i915_vm_resv_put(vma->vm); > > - /* Wait for async active retire */ > - i915_active_wait(&vma->active); > i915_active_fini(&vma->active); > GEM_WARN_ON(vma->resource); > i915_vma_free(vma);
diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c index b70715b1411d6..d2f064d2525cc 100644 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@ -1776,8 +1776,6 @@ static void release_references(struct i915_vma *vma, struct intel_gt *gt, if (vm_ddestroy) i915_vm_resv_put(vma->vm); - /* Wait for async active retire */ - i915_active_wait(&vma->active); i915_active_fini(&vma->active); GEM_WARN_ON(vma->resource); i915_vma_free(vma);
This reverts commit 7a2280e8dcd2f1f436db9631287c0b21cf6a92b0, obsoleted by "drm/i915/vma: Fix UAF on destroy against retire race". Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik@linux.intel.com> Cc: Nirmoy Das <nirmoy.das@intel.com> --- drivers/gpu/drm/i915/i915_vma.c | 2 -- 1 file changed, 2 deletions(-)