drm/i915/gt: Always poison the kernel_context image before unparking (1d0e2c93) · Commits · 戴 / test

drivers/gpu/drm/i915/gt/intel_context_types.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		#include "intel_engine_types.h"
		#include "intel_sseu.h"

		#define CONTEXT_REDZONE POISON_INUSE

		struct i915_gem_context;
		struct i915_vma;
		struct intel_context;

+17 −1

Original line number	Diff line number	Diff line
		@@ -37,8 +37,24 @@ static int __engine_unpark(struct intel_wakeref *wf)

		/* Discard stale context state from across idling */
		ce = engine->kernel_context;
		if (ce)
		if (ce) {
		GEM_BUG_ON(test_bit(CONTEXT_VALID_BIT, &ce->flags));

		/* First poison the image to verify we never fully trust it */
		if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM) && ce->state) {
		struct drm_i915_gem_object *obj = ce->state->obj;
		int type = i915_coherent_map_type(engine->i915);

		map = i915_gem_object_pin_map(obj, type);
		if (!IS_ERR(map)) {
		memset(map, CONTEXT_REDZONE, obj->base.size);
		i915_gem_object_flush_map(obj);
		i915_gem_object_unpin_map(obj);
		}
		}

		ce->ops->reset(ce);
		}

		if (engine->unpark)
		engine->unpark(engine);

+2 −2

Original line number	Diff line number	Diff line
		@@ -2507,7 +2507,7 @@ set_redzone(void vaddr, const struct intel_engine_cs engine)

		vaddr += engine->context_size;

		memset(vaddr, POISON_INUSE, I915_GTT_PAGE_SIZE);
		memset(vaddr, CONTEXT_REDZONE, I915_GTT_PAGE_SIZE);
		}

		static void
		@@ -2518,7 +2518,7 @@ check_redzone(const void vaddr, const struct intel_engine_cs engine)

		vaddr += engine->context_size;

		if (memchr_inv(vaddr, POISON_INUSE, I915_GTT_PAGE_SIZE))
		if (memchr_inv(vaddr, CONTEXT_REDZONE, I915_GTT_PAGE_SIZE))
		dev_err_once(engine->i915->drm.dev,
		"%s context redzone overwritten!\n",
		engine->name);