Commit 44157641 authored by Jon Bloomfield's avatar Jon Bloomfield
Browse files

drm/i915: Disable Secure Batches for gen6+ 



Retroactively stop reporting support for secure batches
through the api for gen6+ so that older binaries trigger
the fallback path instead.

Older binaries use secure batches pre gen6 to access resources
that are not available to normal usermode processes. However,
all known userspace explicitly checks for HAS_SECURE_BATCHES
before relying on the secure batch feature.

Since there are no known binaries relying on this for newer gens
we can kill secure batches from gen6, via I915_PARAM_HAS_SECURE_BATCHES.

v2: rebase (Mika)
v3: rebase (Mika)

Signed-off-by: default avatarJon Bloomfield <jon.bloomfield@intel.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Tyler Hicks <tyhicks@canonical.com>
Signed-off-by: default avatarMika Kuoppala <mika.kuoppala@linux.intel.com>
Reviewed-by: default avatarChris Wilson <chris.p.wilson@intel.com>
parent 0a2f661b

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

+10 −2
Original line number Diff line number Diff line
@@ -2421,6 +2421,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, 
		       struct drm_i915_gem_exec_object2 *exec,

		       struct drm_syncobj **fences)

{

	struct drm_i915_private *i915 = to_i915(dev);

	struct i915_execbuffer eb;

	struct dma_fence *in_fence = NULL;

	struct dma_fence *exec_fence = NULL;
@@ -2432,7 +2433,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, 
	BUILD_BUG_ON(__EXEC_OBJECT_INTERNAL_FLAGS &

		     ~__EXEC_OBJECT_UNKNOWN_FLAGS);



	eb.i915 = to_i915(dev);

	eb.i915 = i915;

	eb.file = file;

	eb.args = args;

	if (DBG_FORCE_RELOC || !(args->flags & I915_EXEC_NO_RELOC))
@@ -2452,6 +2453,13 @@ i915_gem_do_execbuffer(struct drm_device *dev, 


	eb.batch_flags = 0;

	if (args->flags & I915_EXEC_SECURE) {

		if (INTEL_GEN(i915) >= 11)

			return -ENODEV;



		/* Return -EPERM to trigger fallback code on old binaries. */

		if (!HAS_SECURE_BATCHES(i915))

			return -EPERM;



		if (!drm_is_current_master(file) || !capable(CAP_SYS_ADMIN))

			return -EPERM;

drivers/gpu/drm/i915/i915_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -2078,6 +2078,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, 
#define HAS_LLC(dev_priv)	(INTEL_INFO(dev_priv)->has_llc)

#define HAS_SNOOP(dev_priv)	(INTEL_INFO(dev_priv)->has_snoop)

#define HAS_EDRAM(dev_priv)	((dev_priv)->edram_size_mb)

#define HAS_SECURE_BATCHES(dev_priv) (INTEL_GEN(dev_priv) < 6)

#define HAS_WT(dev_priv)	((IS_HASWELL(dev_priv) || \

				 IS_BROADWELL(dev_priv)) && HAS_EDRAM(dev_priv))

drivers/gpu/drm/i915/i915_getparam.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ int i915_getparam_ioctl(struct drm_device *dev, void *data, 
		value = !!(i915->caps.scheduler & I915_SCHEDULER_CAP_SEMAPHORES);

		break;

	case I915_PARAM_HAS_SECURE_BATCHES:

		value = capable(CAP_SYS_ADMIN);

		value = HAS_SECURE_BATCHES(i915) && capable(CAP_SYS_ADMIN);

		break;

	case I915_PARAM_CMD_PARSER_VERSION:

		value = i915_cmd_parser_get_version(i915);

CRA Git | Maintained and supported by SUSTech CRA and CCSE