drm/i915: compile-time consistency check on __EXEC_OBJECT flags
Subsystems (3)
PATCH 1/2 drm/i915: compile-time consistency check on __EXEC_OBJECT flags
Two different sets of flag bits are stored in the 'flags' member of a 'struct drm_i915_gem_exec_object2', and they're defined in two different source files, increasing the risk of an accidental clash.
Some flags in this field are supplied by the user; these are defined in i915_drm.h, and they start from the LSB and work up.
Other flags are defined in i915_gem_execbuffer, for internal use within that file only; they start from the MSB and work down.
So here we add a compile-time check that the two sets of flags do not overlap, which would cause all sorts of confusion.
--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 12 ++++++++---- include/uapi/drm/i915_drm.h | 11 ++++++----- 2 files changed, 14 insertions(+), 9 deletions(-)
drivers/gpu/drm/i915/i915_gem_execbuffer.c +8 -4
@@ -34,10 +34,11 @@#include <linux/dma_remapping.h> #include <linux/uaccess.h> -#define __EXEC_OBJECT_HAS_PIN (1<<31) -#define __EXEC_OBJECT_HAS_FENCE (1<<30) -#define __EXEC_OBJECT_NEEDS_MAP (1<<29) -#define __EXEC_OBJECT_NEEDS_BIAS (1<<28) +#define __EXEC_OBJECT_HAS_PIN (1<<31) +#define __EXEC_OBJECT_HAS_FENCE (1<<30) +#define __EXEC_OBJECT_NEEDS_MAP (1<<29) +#define __EXEC_OBJECT_NEEDS_BIAS (1<<28) +#define __EXEC_OBJECT_INTERNAL_FLAGS (0xf<<28)/* all of the above */ #define BATCH_OFFSET_BIAS (256*1024)
@@ -1007,6 +1008,9 @@ static bool only_mappable_for_reloc(unsigned int flags)unsigned invalid_flags;int i; +/* INTERNAL flags must not overlap with external ones */ +BUILD_BUG_ON (__EXEC_OBJECT_INTERNAL_FLAGS & ~__EXEC_OBJECT_UNKNOWN_FLAGS); + invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;if (USES_FULL_PPGTT (dev)) invalid_flags |=EXEC_OBJECT_NEEDS_GTT ;
include/uapi/drm/i915_drm.h +6 -5
@@ -698,12 +698,13 @@ struct drm_i915_gem_exec_object2 {*/ __u64 offset; -#define EXEC_OBJECT_NEEDS_FENCE (1<<0) -#define EXEC_OBJECT_NEEDS_GTT (1<<1) -#define EXEC_OBJECT_WRITE (1<<2) +#define EXEC_OBJECT_NEEDS_FENCE (1<<0) +#define EXEC_OBJECT_NEEDS_GTT (1<<1) +#define EXEC_OBJECT_WRITE (1<<2)#define EXEC_OBJECT_SUPPORTS_48B_ADDRESS (1<<3) -#define EXEC_OBJECT_PINNED (1<<4) -#define __EXEC_OBJECT_UNKNOWN_FLAGS -(EXEC_OBJECT_PINNED<<1) +#define EXEC_OBJECT_PINNED (1<<4) +/* All remaining bits are MBZ and RESERVED FOR FUTURE USE */ +#define __EXEC_OBJECT_UNKNOWN_FLAGS (-(EXEC_OBJECT_PINNED<<1))__u64 flags;__u64 rsvd1;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: refactor eb_get_batch()
Precursor for fix to secure batch execution. We will need to be able to retrieve the batch VMA (as well as the batch itself) from the eb list, so this patch extracts that part of eb_get_batch() into a separate function, and moves both parts to a more logical place in the file, near where the eb list is created.
Also, it may not be obvious, but the current execbuffer2 ioctl interface requires that the buffer object containing the batch-to-be-executed be the LAST entry in the exec2_list[] array (I expected it to be the first!).
To clarify this, we can replace the rather obscure construct
"list_entry(eb->vmas.prev, ...)" in the old version of eb_get_batch() with the equivalent but more explicit "list_last_entry(&eb->vmas,...)"
in the new eb_get_batch_vma() and of course add an explanatory comment.
--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 49 ++++++++++++++++++------------ 1 file changed, 29 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/i915_gem_execbuffer.c +29 -20
@@ -186,6 +186,35 @@ struct eb_vmas {return ret; } +static inline struct i915_vma * +eb_get_batch_vma (struct eb_vmas *eb) +{ +/* The batch is always the LAST item in the VMA list */ +struct i915_vma *vma =list_last_entry (&eb->vmas,typeof (*vma), exec_list); + +return vma; +} + +static struct drm_i915_gem_object * +eb_get_batch (struct eb_vmas *eb) +{ +struct i915_vma *vma =eb_get_batch_vma (eb); + +/* +* SNA is doing fancy tricks with compressing batch buffers, which leads +* to negative relocation deltas. Usually that works out ok since the +* relocate address is still positive, except when the batch is placed +* very low in the GTT. Ensure this doesn't happen. +* +* Note that actual hangs have only been observed on gen7, but for +* paranoia do it everywhere. +*/ +if ((vma->exec_entry->flags &EXEC_OBJECT_PINNED ) ==0 ) + vma->exec_entry->flags |= __EXEC_OBJECT_NEEDS_BIAS; + +return vma->obj; +} +static struct i915_vma *eb_get_vma (struct eb_vmas *eb,unsigned long handle) {if (eb->and <0 ) {
@@ -1341,26 +1370,6 @@ static bool only_mappable_for_reloc(unsigned int flags)return file_priv->bsd_ring; } -static struct drm_i915_gem_object * -eb_get_batch (struct eb_vmas *eb) -{ -struct i915_vma *vma =list_entry (eb->vmas.prev,typeof (*vma), exec_list); - -/* -* SNA is doing fancy tricks with compressing batch buffers, which leads -* to negative relocation deltas. Usually that works out ok since the -* relocate address is still positive, except when the batch is placed -* very low in the GTT. Ensure this doesn't happen. -* -* Note that actual hangs have only been observed on gen7, but for -* paranoia do it everywhere. -*/ -if ((vma->exec_entry->flags &EXEC_OBJECT_PINNED ) ==0 ) - vma->exec_entry->flags |= __EXEC_OBJECT_NEEDS_BIAS; - -return vma->obj; -} -#define I915_USER_RINGS (4)static const enum intel_engine_id user_ring_map[I915_USER_RINGS +1 ] = {
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Ro.CI.BAT: failure for series starting with [1/2] drm/i915: compile-time consistency check on __EXEC_OBJECT flags
In reply to Dave Gordon== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: compile-time consistency check on __EXEC_OBJECT flags
URL : https://patchwork.freedesktop.org/series/9546/
State : failure
== Summary ==
Series 9546v1 Series without cover letter
http://patchwork.freedesktop.org/api/1.0/series/9546/revisions/1/mbox
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
pass -> DMESG-FAIL (ro-skl3-i5-6260u)
dmesg-fail -> PASS (fi-skl-i5-6260u)
dmesg-fail -> PASS (fi-skl-i7-6700k)
Test gem_exec_suspend:
Subgroup basic-s3:
pass -> INCOMPLETE (fi-skl-i7-6700k)fi-kbl-qkkr total:235 pass:164 dwarn:29 dfail:0 fail:2 skip:40 fi-skl-i5-6260u total:235 pass:206 dwarn:0 dfail:1 fail:2 skip:26 fi-skl-i7-6700k total:106 pass:82 dwarn:0 dfail:0 fail:0 skip:23 fi-snb-i7-2600 total:235 pass:179 dwarn:0 dfail:0 fail:2 skip:54 ro-bdw-i5-5250u total:229 pass:204 dwarn:1 dfail:1 fail:0 skip:23 ro-bdw-i7-5557U total:229 pass:204 dwarn:1 dfail:1 fail:0 skip:23 ro-bdw-i7-5600u total:229 pass:190 dwarn:0 dfail:1 fail:0 skip:38 ro-bsw-n3050 total:229 pass:176 dwarn:1 dfail:1 fail:2 skip:49 ro-byt-n2820 total:229 pass:181 dwarn:0 dfail:1 fail:2 skip:45 ro-hsw-i3-4010u total:229 pass:197 dwarn:0 dfail:1 fail:0 skip:31 ro-hsw-i7-4770r total:229 pass:197 dwarn:0 dfail:1 fail:0 skip:31 ro-ilk-i7-620lm total:229 pass:157 dwarn:0 dfail:1 fail:1 skip:70 ro-ilk1-i5-650 total:224 pass:157 dwarn:0 dfail:1 fail:1 skip:65 ro-ivb-i7-3770 total:229 pass:188 dwarn:0 dfail:1 fail:0 skip:40 ro-skl3-i5-6260u total:229 pass:207 dwarn:1 dfail:2 fail:0 skip:19 ro-snb-i7-2620M total:229 pass:179 dwarn:0 dfail:1 fail:1 skip:48
Results at /archive/results/CI_IGT_test/RO_Patchwork_1431/
2a6e307 drm-intel-nightly: 2016y-07m-05d-11h-50m-09s UTC integration manifest d6cbd4b drm/i915: refactor eb_get_batch()
09bef61 drm/i915: compile-time consistency check on __EXEC_OBJECT flags
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx