Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52306d42 authored by Jon Bloomfield's avatar Jon Bloomfield Committed by Greg Kroah-Hartman
Browse files

drm/i915: Disable Secure Batches for gen6+ 



commit 44157641d448cbc0c4b73c5231d2b911f0cb0427 upstream.

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>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 64003d09

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static int i915_getparam(struct drm_device *dev, void *data, 
		value = i915.semaphores;

		break;

	case I915_PARAM_HAS_SECURE_BATCHES:

		value = capable(CAP_SYS_ADMIN);

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

		break;

	case I915_PARAM_CMD_PARSER_VERSION:

		value = i915_cmd_parser_get_version(dev_priv);

drivers/gpu/drm/i915/i915_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -2661,6 +2661,8 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg) 
#define HAS_BLT(dev_priv)	HAS_ENGINE(dev_priv, BCS)

#define HAS_VEBOX(dev_priv)	HAS_ENGINE(dev_priv, VECS)



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



#define HAS_LLC(dev)		(INTEL_INFO(dev)->has_llc)

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

#define HAS_EDRAM(dev)		(!!(__I915__(dev)->edram_cap & EDRAM_ENABLED))

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+8 −1
Original line number Diff line number Diff line
@@ -1601,6 +1601,13 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, 


	dispatch_flags = 0;

	if (args->flags & I915_EXEC_SECURE) {

		if (INTEL_GEN(dev_priv) >= 11)

			return -ENODEV;



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

		if (!HAS_SECURE_BATCHES(dev_priv))

			return -EPERM;



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

			return -EPERM;