From: Greg Kroah-Hartman Date: Sat, 31 Oct 2020 11:41:57 +0000 (+0100) Subject: drop queue-5.4/drm-i915-gem-serialise-debugfs-i915_gem_objects-with-ctx-mutex.patch X-Git-Tag: v5.4.74~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2dcddd745807925545a27bb65eefd8f98b0c5f66;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.4/drm-i915-gem-serialise-debugfs-i915_gem_objects-with-ctx-mutex.patch --- diff --git a/queue-5.4/drm-i915-gem-serialise-debugfs-i915_gem_objects-with-ctx-mutex.patch b/queue-5.4/drm-i915-gem-serialise-debugfs-i915_gem_objects-with-ctx-mutex.patch deleted file mode 100644 index d743c67cec4..00000000000 --- a/queue-5.4/drm-i915-gem-serialise-debugfs-i915_gem_objects-with-ctx-mutex.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 4fe9af8e881d946bf60790eeb37a7c4f96e28382 Mon Sep 17 00:00:00 2001 -From: Chris Wilson -Date: Thu, 23 Jul 2020 18:21:19 +0100 -Subject: drm/i915/gem: Serialise debugfs i915_gem_objects with ctx->mutex - -From: Chris Wilson - -commit 4fe9af8e881d946bf60790eeb37a7c4f96e28382 upstream. - -Since the debugfs may peek into the GEM contexts as the corresponding -client/fd is being closed, we may try and follow a dangling pointer. -However, the context closure itself is serialised with the ctx->mutex, -so if we hold that mutex as we inspect the state coupled in the context, -we know the pointers within the context are stable and will remain valid -as we inspect their tables. - -Signed-off-by: Chris Wilson -Cc: CQ Tang -Cc: Daniel Vetter -Cc: stable@vger.kernel.org -Reviewed-by: Tvrtko Ursulin -Link: https://patchwork.freedesktop.org/patch/msgid/20200723172119.17649-3-chris@chris-wilson.co.uk -(cherry picked from commit 102f5aa491f262c818e607fc4fee08a724a76c69) -Signed-off-by: Rodrigo Vivi -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/i915/i915_debugfs.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/gpu/drm/i915/i915_debugfs.c -+++ b/drivers/gpu/drm/i915/i915_debugfs.c -@@ -328,6 +328,7 @@ static void print_context_stats(struct s - } - i915_gem_context_unlock_engines(ctx); - -+ mutex_lock(&ctx->mutex); - if (!IS_ERR_OR_NULL(ctx->file_priv)) { - struct file_stats stats = { .vm = ctx->vm, }; - struct drm_file *file = ctx->file_priv->file; -@@ -466,6 +467,7 @@ static int i915_interrupt_info(struct se - - intel_display_power_put(dev_priv, power_domain, pref); - } -+ mutex_unlock(&ctx->mutex); - - pref = intel_display_power_get(dev_priv, POWER_DOMAIN_INIT); - seq_printf(m, "Port hotplug:\t%08x\n", diff --git a/queue-5.4/series b/queue-5.4/series index 77d58eaca83..71759165501 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -37,7 +37,6 @@ p54-avoid-accessing-the-data-mapped-to-streaming-dma.patch cxl-rework-error-message-for-incompatible-slots.patch rdma-addr-fix-race-with-netevent_callback-rdma_addr_cancel.patch mtd-lpddr-fix-bad-logic-in-print_drs_error.patch -drm-i915-gem-serialise-debugfs-i915_gem_objects-with-ctx-mutex.patch serial-qcom_geni_serial-to-correct-qup-version-detection-logic.patch serial-pl011-fix-lockdep-splat-when-handling-magic-sysrq-interrupt.patch pm-runtime-fix-timer_expires-data-type-on-32-bit-arches.patch