drm/i915/gem: dma-buf fixes for migration
Subsystems (2)
cover drm/i915/gem: dma-buf fixes for migration
Our dma-buf code is currently completely broken unless the importer is dynamic in which case the sg_list caching saves the day. In particular, the case where another instance of our driver tries to import a dma-buf exported by our driver ends up in a recursive lock.
Since the recent TTM migration work spec specifies to fix up the dma-buf code with migration and there's no point in doing so when it's completely broken, take a first step to make at least the exporter obey the dma-buf locking rules the dma-buf core enforces for a dynamic exporter:
- Implement and act on pin- and unpin.
- Call move_notify if migrating. (we opt not to migrate while dma-buf_mapped).
- map_dma_buf() is unconditionally called locked.
Add a selftest that ensures that it works with both our own and a fake dynamic importer.
Also implement migration in the second patch before pinning in pin() and map_dma_buf().
Note that the importer remains broken for other non-dynamic exporters, but at least not for the same-driver-separate-instances case.
Regardless whether we want to fix this now with this series, or in an unspecified future, the selftest may come in handy.
Thomas Hellström (2):
drm/i915/gem: Make our dma-buf exporter dynamic drm/i915/gem: Migrate to system at dma-buf map time
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 48 ++++++- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 118 +++++++++++++++++- 2 files changed, 162 insertions(+), 4 deletions(-)
Signature · 6 lines
2.31.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 1/2 drm/i915/gem: Make our dma-buf exporter dynamic
If our exported dma-bufs are imported by another instance of our driver, that instance will typically have the imported dma-bufs locked during dma_buf_map_attachment(). But the exporter also locks the same reservation object in the map_dma_buf() callback, which leads to recursive locking.
Add a live selftest to exercise both dynamic and non-dynamic exports, and as a workaround until we fully support dynamic import and export, declare the exporter dynamic by providing pin() and unpin() implementations. For dynamic importers, make sure we keep the pinning also in map_dma_buf(), to ensure we never need to call dma_buf_move_notify().
Calling dma_buf_move_notify() is at the discretion of the exporter.
v2:
- Extend the selftest with a fake dynamic importer.
- Provide real pin and unpin callbacks to not abuse the interface.
--- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 31 ++++- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 116 +++++++++++++++++- 2 files changed, 143 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +29 -2
@@ -12,6 +12,8 @@#include "i915_gem_object.h" #include "i915_scatterlist.h" +I915_SELFTEST_DECLARE(static bool force_different_devices;) + static struct drm_i915_gem_object *dma_buf_to_obj(struct dma_buf *buf) {return to_intel_bo (buf->priv);
@@ -25,7 +27,14 @@ static struct sg_table *i915_gem_map_dma_buf(struct dma_buf_attachment *attachmestruct scatterlist *src, *dst;int ret, i; - ret =i915_gem_object_pin_pages_unlocked (obj); +assert_object_held (obj); + +/* +* Note. In the dynamic importer case, the object is not yet pinned. +* Let's pin it here to avoid having to call the move_notify +* callback, The call of which is not yet implemented. +*/ + ret =i915_gem_object_pin_pages (obj);if (ret) goto err;
@@ -168,6 +177,21 @@ static int i915_gem_end_cpu_access(struct dma_buf *dma_buf, enum dma_data_directreturn err; } +static int i915_gem_dmabuf_pin (struct dma_buf_attachment *attach) +{ +struct drm_i915_gem_object *obj =dma_buf_to_obj (attach->dmabuf); + +assert_object_held (obj); +return i915_gem_object_pin_pages (obj); +} + +static void i915_gem_dmabuf_unpin (struct dma_buf_attachment *attach) +{ +struct drm_i915_gem_object *obj =dma_buf_to_obj (attach->dmabuf); + +i915_gem_object_unpin_pages (obj); +} +static const struct dma_buf_ops i915_dmabuf_ops = { .map_dma_buf = i915_gem_map_dma_buf, .unmap_dma_buf = i915_gem_unmap_dma_buf,
@@ -177,6 +201,8 @@ static const struct dma_buf_ops i915_dmabuf_ops = { .vunmap = i915_gem_dmabuf_vunmap, .begin_cpu_access = i915_gem_begin_cpu_access, .end_cpu_access = i915_gem_end_cpu_access, + .pin = i915_gem_dmabuf_pin, + .unpin = i915_gem_dmabuf_unpin, };struct dma_buf *i915_gem_prime_export (struct drm_gem_object *gem_obj,int flags)
@@ -241,7 +267,8 @@ struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev,if (dma_buf->ops == &i915_dmabuf_ops) { obj =dma_buf_to_obj (dma_buf);/* is it from our device? */ -if (obj->base.dev == dev) { +if (obj->base.dev == dev && + !I915_SELFTEST_ONLY (force_different_devices)) {/* * Importing dmabuf exported from out own gem increases * refcount on gem itself instead of f_count of dmabuf.
drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +114 -2
141 lines not on this page · raw message
Signature · 6 lines
2.31.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915/gem: Make our dma-buf exporter dynamic
Quoted 12 lines · Thomas Hellström
If our exported dma-bufs are imported by another instance of our driver, that instance will typically have the imported dma-bufs locked during
dma_buf_map_attachment(). But the exporter also locks the same reservation object in themap_dma_buf()callback, which leads to recursive locking.Add a live selftest to exercise both dynamic and non-dynamic exports, and as a workaround until we fully support dynamic import and export, declare the exporter dynamic by providing
pin()andunpin()implementations. For dynamic importers, make sure we keep the pinning also inmap_dma_buf(), to ensure we never need to calldma_buf_move_notify().
Callingdma_buf_move_notify()is at the discretion of the exporter.
Quoted 6 lines
v2:
- Extend the selftest with a fake dynamic importer.
- Provide real pin and unpin callbacks to not abuse the interface.Reported-by Michael J. Ruhl <[email protected]>Signed-off-by Thomas Hellström <[email protected]>
I'm not happy with this, because i915 is currently violating the dma-resv fencing rules for dynamic dma-buf.
Yes since this is just the exporter we can probably get away with yolo'ing things, but Christian and me just spend a lot of angry typing figuring out what the rules actually are, so I really don't like bending them even more just because it's less typing.
All we need for a quick interim fix is to not take the dma_resv_lock from our map/unamp callbacks. Pinning our backing storage from attach/detach callbacks (which are also called under dma_resv_lock) would also achieve that, without mudding any waters. So essentially just moving the pin/unpin_pages_unlocked and we should be good, which is almost as little typing.
Michael, since Thomas is on vacations now, care to type that up? The selftest is imo solid.
This is also consistent with what all other ttm based drivers do (aside from amdgpu, which is fully dynamic), see drm_gem_map_attach in drm_prime.c
Adding Christian as fyi.
-Daniel
Quoted 226 lines
--- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 31 ++++- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 116 +++++++++++++++++- 2 files changed, 143 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +29
-2@@ -12,6 +12,8 @@#include "i915_gem_object.h" #include "i915_scatterlist.h" +I915_SELFTEST_DECLARE(static bool force_different_devices;) + static struct drm_i915_gem_object *dma_buf_to_obj(struct dma_buf *buf) {return to_intel_bo (buf->priv);@@ -25,7 +27,14 @@ static struct sg_table *i915_gem_map_dma_buf(struct dma_buf_attachment *attachmestruct scatterlist *src, *dst;int ret, i; - ret =i915_gem_object_pin_pages_unlocked (obj); +assert_object_held (obj); + +/* +* Note. In the dynamic importer case, the object is not yet pinned. +* Let's pin it here to avoid having to call the move_notify +* callback, The call of which is not yet implemented. +*/ + ret =i915_gem_object_pin_pages (obj);if (ret) goto err;@@ -168,6 +177,21 @@ static int i915_gem_end_cpu_access(struct dma_buf *dma_buf, enum dma_data_directreturn err; } +static int i915_gem_dmabuf_pin (struct dma_buf_attachment *attach) +{ +struct drm_i915_gem_object *obj =dma_buf_to_obj (attach->dmabuf); + +assert_object_held (obj); +return i915_gem_object_pin_pages (obj); +} + +static void i915_gem_dmabuf_unpin (struct dma_buf_attachment *attach) +{ +struct drm_i915_gem_object *obj =dma_buf_to_obj (attach->dmabuf); + +i915_gem_object_unpin_pages (obj); +} +static const struct dma_buf_ops i915_dmabuf_ops = { .map_dma_buf = i915_gem_map_dma_buf, .unmap_dma_buf = i915_gem_unmap_dma_buf,@@ -177,6 +201,8 @@ static const struct dma_buf_ops i915_dmabuf_ops = { .vunmap = i915_gem_dmabuf_vunmap, .begin_cpu_access = i915_gem_begin_cpu_access, .end_cpu_access = i915_gem_end_cpu_access, + .pin = i915_gem_dmabuf_pin, + .unpin = i915_gem_dmabuf_unpin, };struct dma_buf *i915_gem_prime_export (struct drm_gem_object *gem_obj,int flags)@@ -241,7 +267,8 @@ struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev,if (dma_buf->ops == &i915_dmabuf_ops) { obj =dma_buf_to_obj (dma_buf);/* is it from our device? */ -if (obj->base.dev == dev) { +if (obj->base.dev == dev && + !I915_SELFTEST_ONLY (force_different_devices)) {/* * Importing dmabuf exported from out own gem increases * refcount on gem itself instead of f_count of dmabuf. drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +114
-2@@ -35,7 +35,7 @@ static int igt_dmabuf_export(void *arg)static int igt_dmabuf_import_self (void *arg) {struct drm_i915_private *i915 = arg; -struct drm_i915_gem_object *obj; +struct drm_i915_gem_object *obj, *import_obj;struct drm_gem_object *import;struct dma_buf *dmabuf;int err;@@ -65,14 +65,125 @@ static int igt_dmabuf_import_self(void *arg) err = -EINVAL ; goto out_import; } + import_obj =to_intel_bo (import); + +i915_gem_object_lock (import_obj,NULL ); + err =____i915_gem_object_get_pages (import_obj); +i915_gem_object_unlock (import_obj); +if (err) { +pr_err ("Same object dma-buf get_pages failed!\n" ); + goto out_import; + } err =0 ; out_import: -i915_gem_object_put (to_intel_bo (import)); +i915_gem_object_put (import_obj); +out_dmabuf: +dma_buf_put (dmabuf); +out: +i915_gem_object_put (obj); +return err; +} + +static void igt_dmabuf_move_notify (struct dma_buf_attachment *attach) +{ +GEM_WARN_ON (1 ); +} + +static const struct dma_buf_attach_ops igt_dmabuf_attach_ops = { + .move_notify = igt_dmabuf_move_notify, +}; + +static int igt_dmabuf_import_same_driver (void *arg) +{ +struct drm_i915_private *i915 = arg; +struct drm_i915_gem_object *obj, *import_obj; +struct drm_gem_object *import; +struct dma_buf *dmabuf; +struct dma_buf_attachment *import_attach; +struct sg_table *st; +long timeout; +int err; + + force_different_devices = true; + obj =i915_gem_object_create_shmem (i915,PAGE_SIZE ); +if (IS_ERR (obj)) + goto out_ret; + + dmabuf =i915_gem_prime_export (&obj->base,0 ); +if (IS_ERR (dmabuf)) { +pr_err ("i915_gem_prime_export failed with err=%d\n" , + (int )PTR_ERR (dmabuf)); + err =PTR_ERR (dmabuf); + goto out; + } + + import =i915_gem_prime_import (&i915->drm, dmabuf); +if (IS_ERR (import)) { +pr_err ("i915_gem_prime_import failed with err=%d\n" , + (int )PTR_ERR (import)); + err =PTR_ERR (import); + goto out_dmabuf; + } + +if (import == &obj->base) { +pr_err ("i915_gem_prime_import reused gem object!\n" ); + err = -EINVAL ; + goto out_import; + } + + import_obj =to_intel_bo (import); + +i915_gem_object_lock (import_obj,NULL ); + err =____i915_gem_object_get_pages (import_obj); +if (err) { +pr_err ("Different objects dma-buf get_pages failed!\n" ); +i915_gem_object_unlock (import_obj); + goto out_import; + } + +/* +* If the exported object is not in system memory, something +* weird is going on. TODO: When p2p is supported, this is no +* longer considered weird. +*/ +if (obj->mm.region != i915->mm.regions[INTEL_REGION_SMEM ]) { +pr_err ("Exported dma-buf is not in system memory\n" ); + err = -EINVAL ; + } + +i915_gem_object_unlock (import_obj); + +/* Now try a fake dynamic importer */ + import_attach =dma_buf_dynamic_attach (dmabuf, obj->base.dev->dev, + &igt_dmabuf_attach_ops, +NULL ); +if (IS_ERR (import_attach)) + goto out_import; + +dma_resv_lock (dmabuf->resv,NULL ); + st =dma_buf_map_attachment (import_attach,DMA_BIDIRECTIONAL ); +dma_resv_unlock (dmabuf->resv); +if (IS_ERR (st)) + goto out_detach; + + timeout =dma_resv_wait_timeout (dmabuf->resv, false, true,5 *HZ ); +if (!timeout) { +pr_err ("dmabuf wait for exclusive fence timed out.\n" ); + timeout = -ETIME ; + } + err = timeout >0 ?0 : timeout; +dma_buf_unmap_attachment (import_attach, st,DMA_BIDIRECTIONAL ); +out_detach: +dma_buf_detach (dmabuf, import_attach); +out_import: +i915_gem_object_put (import_obj); out_dmabuf:dma_buf_put (dmabuf); out:i915_gem_object_put (obj); +out_ret: + force_different_devices = false;return err; }@@ -286,6 +397,7 @@ int i915_gem_dmabuf_live_selftests(struct drm_i915_private *i915) {static const struct i915_subtest tests[] = {SUBTEST (igt_dmabuf_export), +SUBTEST (igt_dmabuf_import_same_driver), };return i915_subtests (tests, i915);Signature · 1 line
2.31.1
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RE: [PATCH 1/2] drm/i915/gem: Make our dma-buf exporter dynamic
Quoted 48 lines
-----Original Message-----
From: Daniel Vetter <[email protected]>
Sent: Wednesday, June 30, 2021 10:02 AM
To: Thomas Hellström <[email protected]>; Christian König <[email protected]>
Cc: [email protected]; [email protected]; Auld, Matthew <[email protected]>; [email protected]; [email protected]; Ruhl, Michael J <[email protected]>
Subject: Re: [PATCH 1/2] drm/i915/gem: Make our dma-buf exporter dynamicQuoted 3 lines · Thomas Hellström
If our exported dma-bufs are imported by another instance of our driver, that instance will typically have the imported dma-bufs locked during
dma_buf_map_attachment(). But the exporter also locks the samereservation
Quoted 5 lines
object in the
map_dma_buf()callback, which leads to recursive locking.Add a live selftest to exercise both dynamic and non-dynamic exports, and as a workaround until we fully support dynamic import and export, declare the exporter dynamic by providing
pin()andunpin()implementations.
Quoted 1 line
For dynamic importers, make sure we keep the pinning also in
map_dma_buf(),Quoted 9 lines
to ensure we never need to call
dma_buf_move_notify(). Callingdma_buf_move_notify()is at the discretion of the exporter.v2:
- Extend the selftest with a fake dynamic importer.
- Provide real pin and unpin callbacks to not abuse the interface.Reported-by Michael J. Ruhl <[email protected]>Signed-off-by Thomas Hellström <[email protected]>I'm not happy with this, because i915 is currently violating the dma-resv fencing rules for dynamic dma-buf.
Yes since this is just the exporter we can probably get away with yolo'ing things, but Christian and me just spend a lot of angry typing figuring out what the rules actually are, so I really don't like bending them even more just because it's less typing.
All we need for a quick interim fix is to not take the
dma_resv_lockfrom our map/unamp callbacks. Pinning our backing storage from attach/detach callbacks (which are also called underdma_resv_lock) would also achieve that, without mudding any waters. So essentially just moving the pin/unpin_pages_unlocked and we should be good, which is almost as little typing.
Quoted 2 lines
Michael, since Thomas is on vacations now, care to type that up? The selftest is imo solid.
Yes, I will get that done.
Mike
Quoted 247 lines
This is also consistent with what all other ttm based drivers do (aside from amdgpu, which is fully dynamic), see
drm_gem_map_attachindrm_prime.cAdding Christian as fyi.
-DanielQuoted 3 lines
--- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 31 ++++- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 116+++++++++++++++++-
Review
Quoted 3 lines
2 files changed, 143 insertions(+), 4 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.cdrivers/gpu/drm/i915/gem/i915_gem_dmabuf.c line 17
Quoted 10 lines
index
616c3a2f1baf..918c19df7b66100644drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +2
-0@@ -12,6 +12,8 @@#include "i915_gem_object.h" #include "i915_scatterlist.h" +I915_SELFTEST_DECLARE(static bool force_different_devices;) + static struct drm_i915_gem_object *dma_buf_to_obj(struct dma_buf*buf)
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c static struct sg_table
Quoted 3 lines
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +0
-0{return to_intel_bo (buf->priv);@@ -25,7 +27,14 @@ static struct sg_table*i915_gem_map_dma_buf(struct
dma_buf_attachment*attachmedrivers/gpu/drm/i915/gem/i915_gem_dmabuf.c static int i915_gem_end_cpu_access(struct
Quoted 16 lines
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +8
-1struct scatterlist *src, *dst;int ret, i; - ret =i915_gem_object_pin_pages_unlocked (obj); +assert_object_held (obj); + +/* +* Note. In the dynamic importer case, the object is not yet pinned. +* Let's pin it here to avoid having to call the move_notify +* callback, The call of which is not yet implemented. +*/ + ret =i915_gem_object_pin_pages (obj);if (ret) goto err;@@ -168,6 +177,21 @@ static int i915_gem_end_cpu_access(struct
dma_buf*dma_buf, enumdma_data_directdrivers/gpu/drm/i915/gem/i915_gem_dmabuf.c static const struct dma_buf_ops i915_dmabuf_ops =
Quoted 24 lines
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +15
-0return err; } +static int i915_gem_dmabuf_pin (struct dma_buf_attachment *attach) +{ +struct drm_i915_gem_object *obj =dma_buf_to_obj (attach- dmabuf); + +assert_object_held (obj); +return i915_gem_object_pin_pages (obj); +} + +static void i915_gem_dmabuf_unpin (struct dma_buf_attachment *attach) +{ +struct drm_i915_gem_object *obj =dma_buf_to_obj (attach- dmabuf); + +i915_gem_object_unpin_pages (obj); +} +static const struct dma_buf_ops i915_dmabuf_ops = {drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +0
-0.map_dma_buf = i915_gem_map_dma_buf, .unmap_dma_buf = i915_gem_unmap_dma_buf,@@ -177,6 +201,8 @@ static const struct dma_buf_ops i915_dmabuf_ops ={
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c static const struct dma_buf_ops i915_dmabuf_ops = {
Quoted 8 lines
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +2
-0.vunmap = i915_gem_dmabuf_vunmap, .begin_cpu_access = i915_gem_begin_cpu_access, .end_cpu_access = i915_gem_end_cpu_access, + .pin = i915_gem_dmabuf_pin, + .unpin = i915_gem_dmabuf_unpin, }; struct dma_buf *i915_gem_prime_export(struct drm_gem_object
*gem_obj, int flags)drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c struct drm_gem_object
Quoted 1 line
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +0
-0@@ -241,7 +267,8 @@ struct drm_gem_object*i915_gem_prime_import(struct
drm_device*dev,drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev,
Quoted 8 lines
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +2
-1if (dma_buf->ops == &i915_dmabuf_ops) { obj =dma_buf_to_obj (dma_buf);/* is it from our device? */ -if (obj->base.dev == dev) { +if (obj->base.dev == dev && + !I915_SELFTEST_ONLY (force_different_devices)) {/* * Importing dmabuf exported from out own gem increases
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c struct drm_gem_object · line 274
Quoted 1 line
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +0
-0* refcount on gem itself instead of f_count of dmabuf.
Review
Quoted 1 line
(quoted diff) +0
-0
b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.cQuoted 106 lines
index
dd74bc09ec88..868b3469ecbd100644drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +87
-2@@ -35,7 +35,7 @@ static int igt_dmabuf_export(void *arg)static int igt_dmabuf_import_self (void *arg) {struct drm_i915_private *i915 = arg; -struct drm_i915_gem_object *obj; +struct drm_i915_gem_object *obj, *import_obj;struct drm_gem_object *import;struct dma_buf *dmabuf;int err;@@ -65,14 +65,125 @@ static int igt_dmabuf_import_self(void *arg) err = -EINVAL ; goto out_import; } + import_obj =to_intel_bo (import); + +i915_gem_object_lock (import_obj,NULL ); + err =____i915_gem_object_get_pages (import_obj); +i915_gem_object_unlock (import_obj); +if (err) { +pr_err ("Same object dma-buf get_pages failed!\n" ); + goto out_import; + } err =0 ; out_import: -i915_gem_object_put (to_intel_bo (import)); +i915_gem_object_put (import_obj); +out_dmabuf: +dma_buf_put (dmabuf); +out: +i915_gem_object_put (obj); +return err; +} + +static void igt_dmabuf_move_notify (struct dma_buf_attachment *attach) +{ +GEM_WARN_ON (1 ); +} + +static const struct dma_buf_attach_ops igt_dmabuf_attach_ops = { + .move_notify = igt_dmabuf_move_notify, +}; + +static int igt_dmabuf_import_same_driver (void *arg) +{ +struct drm_i915_private *i915 = arg; +struct drm_i915_gem_object *obj, *import_obj; +struct drm_gem_object *import; +struct dma_buf *dmabuf; +struct dma_buf_attachment *import_attach; +struct sg_table *st; +long timeout; +int err; + + force_different_devices = true; + obj =i915_gem_object_create_shmem (i915,PAGE_SIZE ); +if (IS_ERR (obj)) + goto out_ret; + + dmabuf =i915_gem_prime_export (&obj->base,0 ); +if (IS_ERR (dmabuf)) { +pr_err ("i915_gem_prime_export failed with err=%d\n" , + (int )PTR_ERR (dmabuf)); + err =PTR_ERR (dmabuf); + goto out; + } + + import =i915_gem_prime_import (&i915->drm, dmabuf); +if (IS_ERR (import)) { +pr_err ("i915_gem_prime_import failed with err=%d\n" , + (int )PTR_ERR (import)); + err =PTR_ERR (import); + goto out_dmabuf; + } + +if (import == &obj->base) { +pr_err ("i915_gem_prime_import reused gem object!\n" ); + err = -EINVAL ; + goto out_import; + } + + import_obj =to_intel_bo (import); + +i915_gem_object_lock (import_obj,NULL ); + err =____i915_gem_object_get_pages (import_obj); +if (err) { +pr_err ("Different objects dma-buf get_pages failed!\n" ); +i915_gem_object_unlock (import_obj); + goto out_import; + } + +/* +* If the exported object is not in system memory, something +* weird is going on. TODO: When p2p is supported, this is no +* longer considered weird. +*/ +if (obj->mm.region != i915->mm.regions[INTEL_REGION_SMEM ]) { +pr_err ("Exported dma-buf is not in system memory\n" ); + err = -EINVAL ; + } + +i915_gem_object_unlock (import_obj); +drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c static int igt_dmabuf_import_self(void *arg) · line 166
Quoted 10 lines
drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +9
-0+/* Now try a fake dynamic importer */ + import_attach =dma_buf_dynamic_attach (dmabuf, obj->base.dev- dev, + &igt_dmabuf_attach_ops, +NULL ); +if (IS_ERR (import_attach)) + goto out_import; + +dma_resv_lock (dmabuf->resv,NULL ); + st = dma_buf_map_attachment(import_attach,
DMA_BIDIRECTIONAL);drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c static int igt_dmabuf_import_self(void *arg)
Quoted 5 lines
drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +5
-0+dma_resv_unlock (dmabuf->resv); +if (IS_ERR (st)) + goto out_detach; + + timeout = dma_resv_wait_timeout(dmabuf->resv, false, true, 5 *HZ);
drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c static int igt_dmabuf_import_self(void *arg)
Quoted 6 lines
drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +6
-0+if (!timeout) { +pr_err ("dmabuf wait for exclusive fence timed out.\n" ); + timeout = -ETIME ; + } + err = timeout >0 ?0 : timeout; + dma_buf_unmap_attachment(import_attach, st,
DMA_BIDIRECTIONAL);drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c int i915_gem_dmabuf_live_selftests(struct
Quoted 14 lines
drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +6
-0+out_detach: +dma_buf_detach (dmabuf, import_attach); +out_import: +i915_gem_object_put (import_obj); out_dmabuf:dma_buf_put (dmabuf); out:i915_gem_object_put (obj); +out_ret: + force_different_devices = false;return err; }@@ -286,6 +397,7 @@ int i915_gem_dmabuf_live_selftests(struct
drm_i915_private*i915)Quoted 6 lines
drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +1
-0{static const struct i915_subtest tests[] = {SUBTEST (igt_dmabuf_export), +SUBTEST (igt_dmabuf_import_same_driver), };
Quoted 9 lines
Quoted 4 lines
drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +0
-1return i915_subtests (tests, i915); --2.31.1
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 1/2] drm/i915/gem: Make our dma-buf exporter dynamic
In reply to Daniel VetterQuoted 20 lines · Daniel Vetter
Quoted 12 lines · Thomas Hellström
If our exported dma-bufs are imported by another instance of our driver, that instance will typically have the imported dma-bufs locked during
dma_buf_map_attachment(). But the exporter also locks the same reservation object in themap_dma_buf()callback, which leads to recursive locking.Add a live selftest to exercise both dynamic and non-dynamic exports, and as a workaround until we fully support dynamic import and export, declare the exporter dynamic by providing
pin()andunpin()implementations. For dynamic importers, make sure we keep the pinning also inmap_dma_buf(), to ensure we never need to calldma_buf_move_notify().
Callingdma_buf_move_notify()is at the discretion of the exporter.Quoted 6 lines
v2:
- Extend the selftest with a fake dynamic importer.
- Provide real pin and unpin callbacks to not abuse the interface.Reported-by Michael J. Ruhl <[email protected]>Signed-off-by Thomas Hellström <[email protected]>
Quoted 7 lines
I'm not happy with this, because i915 is currently violating the dma-resv fencing rules for dynamic dma-buf.
Yes since this is just the exporter we can probably get away with yolo'ing things, but Christian and me just spend a lot of angry typing figuring out what the rules actually are, so I really don't like bending them even more just because it's less typing.
To clarify what I meant here: I think the code is correct in the sense that it's not breaking any other existing code upstream in a functional or security relevant way.
What I meant with yolo merging is that if we land some dynamic dma-buf exporter support just to fix a bug which with slightly more lines can be fixed without resorting to quickly enabling dynamic dma-buf exporting while a) we know i915 is breaking dma-resv rules already and
b) there was just a few weeks of rather angry discussions on this topic.
That's just a recipe to piss people off, at least if I'd be in Christian's shoes and see this land I'd get furious. So yolo on the collaboration and people side of things, not so much technically incorrect.
Plus with the sketch I described below we can fix the underlying issue we're seeing in a clean way, by essentially aligning what i915 does to what all other non-dynamic dma-buf ttm driver implementations do in drm_prime.c. Defacto that's the only way that works, and it is the contract for non-dynamic dma-buf for a driver using dma_resv_lock. The only reason we could get away without lockdep splats with our current dma-buf code in i915 of attempting to handle dma-buf more dynamic was because we used our completely independent locking design (and also never shared with another i915 instance). That illusion falls apart with i915 using dma-resv and with now multiple i915 instances being possible.
tldr; Using this way we can cleanly untangle solving the locking issue at hand from the fairly bigger topic of how we are going to support dynamic dma-buf and p2p and all that in i915.
I hope this explains a bit better why I have my take here like that. -Daniel
Quoted 248 lines
All we need for a quick interim fix is to not take the
dma_resv_lockfrom our map/unamp callbacks. Pinning our backing storage from attach/detach callbacks (which are also called underdma_resv_lock) would also achieve that, without mudding any waters. So essentially just moving the pin/unpin_pages_unlocked and we should be good, which is almost as little typing.Michael, since Thomas is on vacations now, care to type that up? The selftest is imo solid.
This is also consistent with what all other ttm based drivers do (aside from amdgpu, which is fully dynamic), see
drm_gem_map_attachindrm_prime.cAdding Christian as fyi.
-DanielQuoted 224 lines
--- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 31 ++++- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 116 +++++++++++++++++- 2 files changed, 143 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +29
-2@@ -12,6 +12,8 @@#include "i915_gem_object.h" #include "i915_scatterlist.h" +I915_SELFTEST_DECLARE(static bool force_different_devices;) + static struct drm_i915_gem_object *dma_buf_to_obj(struct dma_buf *buf) {return to_intel_bo (buf->priv);@@ -25,7 +27,14 @@ static struct sg_table *i915_gem_map_dma_buf(struct dma_buf_attachment *attachmestruct scatterlist *src, *dst;int ret, i; - ret =i915_gem_object_pin_pages_unlocked (obj); +assert_object_held (obj); + +/* +* Note. In the dynamic importer case, the object is not yet pinned. +* Let's pin it here to avoid having to call the move_notify +* callback, The call of which is not yet implemented. +*/ + ret =i915_gem_object_pin_pages (obj);if (ret) goto err;@@ -168,6 +177,21 @@ static int i915_gem_end_cpu_access(struct dma_buf *dma_buf, enum dma_data_directreturn err; } +static int i915_gem_dmabuf_pin (struct dma_buf_attachment *attach) +{ +struct drm_i915_gem_object *obj =dma_buf_to_obj (attach->dmabuf); + +assert_object_held (obj); +return i915_gem_object_pin_pages (obj); +} + +static void i915_gem_dmabuf_unpin (struct dma_buf_attachment *attach) +{ +struct drm_i915_gem_object *obj =dma_buf_to_obj (attach->dmabuf); + +i915_gem_object_unpin_pages (obj); +} +static const struct dma_buf_ops i915_dmabuf_ops = { .map_dma_buf = i915_gem_map_dma_buf, .unmap_dma_buf = i915_gem_unmap_dma_buf,@@ -177,6 +201,8 @@ static const struct dma_buf_ops i915_dmabuf_ops = { .vunmap = i915_gem_dmabuf_vunmap, .begin_cpu_access = i915_gem_begin_cpu_access, .end_cpu_access = i915_gem_end_cpu_access, + .pin = i915_gem_dmabuf_pin, + .unpin = i915_gem_dmabuf_unpin, };struct dma_buf *i915_gem_prime_export (struct drm_gem_object *gem_obj,int flags)@@ -241,7 +267,8 @@ struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev,if (dma_buf->ops == &i915_dmabuf_ops) { obj =dma_buf_to_obj (dma_buf);/* is it from our device? */ -if (obj->base.dev == dev) { +if (obj->base.dev == dev && + !I915_SELFTEST_ONLY (force_different_devices)) {/* * Importing dmabuf exported from out own gem increases * refcount on gem itself instead of f_count of dmabuf. drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +114
-3@@ -35,7 +35,7 @@ static int igt_dmabuf_export(void *arg)static int igt_dmabuf_import_self (void *arg) {struct drm_i915_private *i915 = arg; -struct drm_i915_gem_object *obj; +struct drm_i915_gem_object *obj, *import_obj;struct drm_gem_object *import;struct dma_buf *dmabuf;int err;@@ -65,14 +65,125 @@ static int igt_dmabuf_import_self(void *arg) err = -EINVAL ; goto out_import; } + import_obj =to_intel_bo (import); + +i915_gem_object_lock (import_obj,NULL ); + err =____i915_gem_object_get_pages (import_obj); +i915_gem_object_unlock (import_obj); +if (err) { +pr_err ("Same object dma-buf get_pages failed!\n" ); + goto out_import; + } err =0 ; out_import: -i915_gem_object_put (to_intel_bo (import)); +i915_gem_object_put (import_obj); +out_dmabuf: +dma_buf_put (dmabuf); +out: +i915_gem_object_put (obj); +return err; +} + +static void igt_dmabuf_move_notify (struct dma_buf_attachment *attach) +{ +GEM_WARN_ON (1 ); +} + +static const struct dma_buf_attach_ops igt_dmabuf_attach_ops = { + .move_notify = igt_dmabuf_move_notify, +}; + +static int igt_dmabuf_import_same_driver (void *arg) +{ +struct drm_i915_private *i915 = arg; +struct drm_i915_gem_object *obj, *import_obj; +struct drm_gem_object *import; +struct dma_buf *dmabuf; +struct dma_buf_attachment *import_attach; +struct sg_table *st; +long timeout; +int err; + + force_different_devices = true; + obj =i915_gem_object_create_shmem (i915,PAGE_SIZE ); +if (IS_ERR (obj)) + goto out_ret; + + dmabuf =i915_gem_prime_export (&obj->base,0 ); +if (IS_ERR (dmabuf)) { +pr_err ("i915_gem_prime_export failed with err=%d\n" , + (int )PTR_ERR (dmabuf)); + err =PTR_ERR (dmabuf); + goto out; + } + + import =i915_gem_prime_import (&i915->drm, dmabuf); +if (IS_ERR (import)) { +pr_err ("i915_gem_prime_import failed with err=%d\n" , + (int )PTR_ERR (import)); + err =PTR_ERR (import); + goto out_dmabuf; + } + +if (import == &obj->base) { +pr_err ("i915_gem_prime_import reused gem object!\n" ); + err = -EINVAL ; + goto out_import; + } + + import_obj =to_intel_bo (import); + +i915_gem_object_lock (import_obj,NULL ); + err =____i915_gem_object_get_pages (import_obj); +if (err) { +pr_err ("Different objects dma-buf get_pages failed!\n" ); +i915_gem_object_unlock (import_obj); + goto out_import; + } + +/* +* If the exported object is not in system memory, something +* weird is going on. TODO: When p2p is supported, this is no +* longer considered weird. +*/ +if (obj->mm.region != i915->mm.regions[INTEL_REGION_SMEM ]) { +pr_err ("Exported dma-buf is not in system memory\n" ); + err = -EINVAL ; + } + +i915_gem_object_unlock (import_obj); + +/* Now try a fake dynamic importer */ + import_attach =dma_buf_dynamic_attach (dmabuf, obj->base.dev->dev, + &igt_dmabuf_attach_ops, +NULL ); +if (IS_ERR (import_attach)) + goto out_import; + +dma_resv_lock (dmabuf->resv,NULL ); + st =dma_buf_map_attachment (import_attach,DMA_BIDIRECTIONAL ); +dma_resv_unlock (dmabuf->resv); +if (IS_ERR (st)) + goto out_detach; + + timeout =dma_resv_wait_timeout (dmabuf->resv, false, true,5 *HZ ); +if (!timeout) { +pr_err ("dmabuf wait for exclusive fence timed out.\n" ); + timeout = -ETIME ; + } + err = timeout >0 ?0 : timeout; +dma_buf_unmap_attachment (import_attach, st,DMA_BIDIRECTIONAL ); +out_detach: +dma_buf_detach (dmabuf, import_attach); +out_import: +i915_gem_object_put (import_obj); out_dmabuf:dma_buf_put (dmabuf); out:i915_gem_object_put (obj); +out_ret: + force_different_devices = false;return err; }@@ -286,6 +397,7 @@ int i915_gem_dmabuf_live_selftests(struct drm_i915_private *i915) {static const struct i915_subtest tests[] = {SUBTEST (igt_dmabuf_export), +SUBTEST (igt_dmabuf_import_same_driver), };return i915_subtests (tests, i915); --Quoted 2 lines
2.31.1
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915/gem: Migrate to system at dma-buf map time
In reply to Thomas HellströmUntil we support p2p dma or as a complement to that, migrate data to system memory at dma-buf map time if possible.
v2:
- Rebase on dynamic exporter. Update the igt_dmabuf_import_same_driver selftest to migrate if we are LMEM capable.
v3:
- Migrate also in the pin() callback.
--- drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 21 +++++++++++++++++-- .../drm/i915/gem/selftests/i915_gem_dmabuf.c | 4 +++- 2 files changed, 22 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +19 -2
@@ -34,7 +34,14 @@ static struct sg_table *i915_gem_map_dma_buf(struct dma_buf_attachment *attachme* Let's pin it here to avoid having to call the move_notify * callback, The call of which is not yet implemented. */ - ret =i915_gem_object_pin_pages (obj); +if (!i915_gem_object_can_migrate (obj,INTEL_REGION_SMEM )) +return ERR_PTR (-EOPNOTSUPP ); + + ret =i915_gem_object_migrate (obj,NULL ,INTEL_REGION_SMEM ); +if (!ret) + ret =i915_gem_object_wait_migration (obj,0 ); +if (!ret) + ret =i915_gem_object_pin_pages (obj);if (ret) goto err;
@@ -180,9 +187,19 @@ static int i915_gem_end_cpu_access(struct dma_buf *dma_buf, enum dma_data_directstatic int i915_gem_dmabuf_pin (struct dma_buf_attachment *attach) {struct drm_i915_gem_object *obj =dma_buf_to_obj (attach->dmabuf); +int ret;assert_object_held (obj); -return i915_gem_object_pin_pages (obj); + +if (!i915_gem_object_can_migrate (obj,INTEL_REGION_SMEM )) +return -EOPNOTSUPP ; + ret =i915_gem_object_migrate (obj,NULL ,INTEL_REGION_SMEM ); +if (!ret) + ret =i915_gem_object_wait_migration (obj,0 ); +if (!ret) + ret =i915_gem_object_pin_pages (obj); + +return ret; }static void i915_gem_dmabuf_unpin (struct dma_buf_attachment *attach)
drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c +3 -1
@@ -106,7 +106,9 @@ static int igt_dmabuf_import_same_driver(void *arg)int err; force_different_devices = true; - obj =i915_gem_object_create_shmem (i915,PAGE_SIZE ); + obj =i915_gem_object_create_lmem (i915,PAGE_SIZE ,0 ); +if (IS_ERR (obj)) + obj =i915_gem_object_create_shmem (i915,PAGE_SIZE );if (IS_ERR (obj)) goto out_ret;
Signature · 6 lines
2.31.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/gem: dma-buf fixes for migration
In reply to Thomas Hellström== Series Details ==
== Series Details ==
Series: drm/i915/gem: dma-buf fixes for migration
URL : https://patchwork.freedesktop.org/series/92070/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 3b50433924c8 drm/i915/gem: Make our dma-buf exporter dynamic -:16: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #16: declare the exporter dynamic by providing pin() and unpin() implementations.
total: 0 errors, 1 warnings, 0 checks, 202 lines checked bde352ace7ae drm/i915/gem: Migrate to system at dma-buf map time
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/gem: dma-buf fixes for migration
In reply to Thomas Hellström== Series Details ==
== Series Details ==
Series: drm/i915/gem: dma-buf fixes for migration
URL : https://patchwork.freedesktop.org/series/92070/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_10295 -> Patchwork_20494
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_20494 absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_20494, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/index.html
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_20494:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live@dmabuf:
- fi-cfl-8700k: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-cfl-8700k/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-cfl-8700k/igt@i915_selftest@[email protected]
- fi-kbl-8809g: [PASS][3] -> [DMESG-FAIL][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-kbl-8809g/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-kbl-8809g/igt@i915_selftest@[email protected]
- fi-glk-dsi: [PASS][5] -> [DMESG-FAIL][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-glk-dsi/igt@i915_selftest@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-glk-dsi/igt@i915_selftest@[email protected]
- fi-snb-2520m: [PASS][7] -> [DMESG-FAIL][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-snb-2520m/igt@i915_selftest@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-snb-2520m/igt@i915_selftest@[email protected]
- fi-bsw-kefka: [PASS][9] -> [DMESG-FAIL][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-bsw-kefka/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-bsw-kefka/igt@i915_selftest@[email protected]
- fi-cfl-guc: [PASS][11] -> [DMESG-FAIL][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-cfl-guc/igt@i915_selftest@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-cfl-guc/igt@i915_selftest@[email protected]
- fi-skl-6600u: [PASS][13] -> [DMESG-FAIL][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-skl-6600u/igt@i915_selftest@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-skl-6600u/igt@i915_selftest@[email protected]
- fi-cml-s: [PASS][15] -> [DMESG-FAIL][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-cml-s/igt@i915_selftest@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-cml-s/igt@i915_selftest@[email protected]
- fi-pnv-d510: [PASS][17] -> [DMESG-FAIL][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-pnv-d510/igt@i915_selftest@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-pnv-d510/igt@i915_selftest@[email protected]
- fi-kbl-7567u: [PASS][19] -> [DMESG-FAIL][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-kbl-7567u/igt@i915_selftest@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-kbl-7567u/igt@i915_selftest@[email protected]
- fi-icl-y: [PASS][21] -> [DMESG-FAIL][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-icl-y/igt@i915_selftest@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-icl-y/igt@i915_selftest@[email protected]
- fi-ilk-650: [PASS][23] -> [DMESG-FAIL][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-ilk-650/igt@i915_selftest@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-ilk-650/igt@i915_selftest@[email protected]
- fi-ivb-3770: [PASS][25] -> [DMESG-FAIL][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-ivb-3770/igt@i915_selftest@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-ivb-3770/igt@i915_selftest@[email protected]
- fi-skl-6700k2: [PASS][27] -> [DMESG-FAIL][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-skl-6700k2/igt@i915_selftest@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-skl-6700k2/igt@i915_selftest@[email protected]
- fi-elk-e7500: [PASS][29] -> [DMESG-FAIL][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-elk-e7500/igt@i915_selftest@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-elk-e7500/igt@i915_selftest@[email protected]
- fi-bxt-dsi: [PASS][31] -> [DMESG-FAIL][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-bxt-dsi/igt@i915_selftest@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-bxt-dsi/igt@i915_selftest@[email protected]
- fi-hsw-4770: [PASS][33] -> [DMESG-FAIL][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-hsw-4770/igt@i915_selftest@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-hsw-4770/igt@i915_selftest@[email protected]
- fi-snb-2600: [PASS][35] -> [DMESG-FAIL][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-snb-2600/igt@i915_selftest@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-snb-2600/igt@i915_selftest@[email protected]
- fi-bwr-2160: [PASS][37] -> [DMESG-FAIL][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-bwr-2160/igt@i915_selftest@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-bwr-2160/igt@i915_selftest@[email protected]
- fi-kbl-soraka: [PASS][39] -> [DMESG-FAIL][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-kbl-soraka/igt@i915_selftest@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-kbl-soraka/igt@i915_selftest@[email protected]
- fi-bsw-nick: [PASS][41] -> [DMESG-FAIL][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-bsw-nick/igt@i915_selftest@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-bsw-nick/igt@i915_selftest@[email protected]
- fi-kbl-7500u: [PASS][43] -> [DMESG-FAIL][44]
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-kbl-7500u/igt@i915_selftest@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-kbl-7500u/igt@i915_selftest@[email protected]
- fi-kbl-guc: [PASS][45] -> [DMESG-FAIL][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-kbl-guc/igt@i915_selftest@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-kbl-guc/igt@i915_selftest@[email protected]
- fi-cfl-8109u: [PASS][47] -> [DMESG-FAIL][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-cfl-8109u/igt@i915_selftest@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-cfl-8109u/igt@i915_selftest@[email protected]
- fi-kbl-r: [PASS][49] -> [DMESG-FAIL][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-kbl-r/igt@i915_selftest@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-kbl-r/igt@i915_selftest@[email protected]
* igt@runner@aborted:
- fi-snb-2520m: NOTRUN -> [FAIL][51]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-snb-2520m/igt@[email protected]
- fi-snb-2600: NOTRUN -> [FAIL][52]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-snb-2600/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@i915_selftest@live@dmabuf:
- {fi-tgl-dsi}: [PASS][53] -> [DMESG-FAIL][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-tgl-dsi/igt@i915_selftest@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-tgl-dsi/igt@i915_selftest@[email protected]
- {fi-hsw-gt1}: [PASS][55] -> [DMESG-FAIL][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-hsw-gt1/igt@i915_selftest@[email protected]
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-hsw-gt1/igt@i915_selftest@[email protected]
- {fi-ehl-2}: [PASS][57] -> [DMESG-FAIL][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-ehl-2/igt@i915_selftest@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-ehl-2/igt@i915_selftest@[email protected]
- {fi-tgl-1115g4}: [PASS][59] -> [DMESG-FAIL][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-tgl-1115g4/igt@i915_selftest@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-tgl-1115g4/igt@i915_selftest@[email protected]
- {fi-jsl-1}: [PASS][61] -> [DMESG-FAIL][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-jsl-1/igt@i915_selftest@[email protected]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-jsl-1/igt@i915_selftest@[email protected]
- {fi-dg1-1}: [PASS][63] -> [DMESG-FAIL][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-dg1-1/igt@i915_selftest@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-dg1-1/igt@i915_selftest@[email protected]
* igt@runner@aborted:
- {fi-dg1-1}: NOTRUN -> [FAIL][65]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-dg1-1/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_20494 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@gt_heartbeat:
- fi-cml-s: [PASS][66] -> [DMESG-FAIL][67] ([i915#2291] / [i915#541])
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10295/fi-cml-s/igt@i915_selftest@live@gt_heartbeat.html
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-cml-s/igt@i915_selftest@live@gt_heartbeat.html
* igt@runner@aborted:
- fi-ilk-650: NOTRUN -> [FAIL][68] ([fdo#109271])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-ilk-650/igt@[email protected]
- fi-pnv-d510: NOTRUN -> [FAIL][69] ([fdo#109271] / [i915#2403] / [i915#2505])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-pnv-d510/igt@[email protected]
- fi-bsw-kefka: NOTRUN -> [FAIL][70] ([fdo#109271] / [i915#1436])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-bsw-kefka/igt@[email protected]
- fi-cfl-8700k: NOTRUN -> [FAIL][71] ([i915#3363])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-cfl-8700k/igt@[email protected]
- fi-skl-6600u: NOTRUN -> [FAIL][72] ([i915#1436] / [i915#3363])
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-skl-6600u/igt@[email protected]
- fi-cfl-8109u: NOTRUN -> [FAIL][73] ([i915#3363])
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-cfl-8109u/igt@[email protected]
- fi-glk-dsi: NOTRUN -> [FAIL][74] ([i915#3363] / [k.org#202321])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-glk-dsi/igt@[email protected]
- fi-bsw-nick: NOTRUN -> [FAIL][75] ([fdo#109271] / [i915#1436])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-bsw-nick/igt@[email protected]
- fi-kbl-8809g: NOTRUN -> [FAIL][76] ([i915#1436] / [i915#3363])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-kbl-8809g/igt@[email protected]
- fi-kbl-r: NOTRUN -> [FAIL][77] ([i915#1436] / [i915#3363])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-kbl-r/igt@[email protected]
- fi-bdw-5557u: NOTRUN -> [FAIL][78] ([i915#1602] / [i915#2029])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-bdw-5557u/igt@[email protected]
- fi-bwr-2160: NOTRUN -> [FAIL][79] ([i915#2505])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-bwr-2160/igt@[email protected]
- fi-kbl-soraka: NOTRUN -> [FAIL][80] ([i915#1436] / [i915#3363])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-kbl-soraka/igt@[email protected]
- fi-hsw-4770: NOTRUN -> [FAIL][81] ([fdo#109271] / [i915#1436] / [i915#2505])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-hsw-4770/igt@[email protected]
- fi-kbl-7500u: NOTRUN -> [FAIL][82] ([i915#1436] / [i915#3363])
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-kbl-7500u/igt@[email protected]
- fi-kbl-guc: NOTRUN -> [FAIL][83] ([i915#1436] / [i915#3363])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-kbl-guc/igt@[email protected]
- fi-ivb-3770: NOTRUN -> [FAIL][84] ([fdo#109271])
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-ivb-3770/igt@[email protected]
- fi-bxt-dsi: NOTRUN -> [FAIL][85] ([i915#3363])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-bxt-dsi/igt@[email protected]
- fi-elk-e7500: NOTRUN -> [FAIL][86] ([fdo#109271])
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-elk-e7500/igt@[email protected]
- fi-cml-s: NOTRUN -> [FAIL][87] ([i915#3363] / [i915#3462])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-cml-s/igt@[email protected]
- fi-cfl-guc: NOTRUN -> [FAIL][88] ([i915#3363])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-cfl-guc/igt@[email protected]
- fi-icl-y: NOTRUN -> [FAIL][89] ([i915#2782])
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-icl-y/igt@[email protected]
- fi-kbl-7567u: NOTRUN -> [FAIL][90] ([i915#1436] / [i915#3363])
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-kbl-7567u/igt@[email protected]
- fi-skl-6700k2: NOTRUN -> [FAIL][91] ([i915#1436] / [i915#3363])
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/fi-skl-6700k2/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1602]: https://gitlab.freedesktop.org/drm/intel/issues/1602
[i915#2029]: https://gitlab.freedesktop.org/drm/intel/issues/2029
[i915#2291]: https://gitlab.freedesktop.org/drm/intel/issues/2291
[i915#2403]: https://gitlab.freedesktop.org/drm/intel/issues/2403
[i915#2505]: https://gitlab.freedesktop.org/drm/intel/issues/2505
[i915#2782]: https://gitlab.freedesktop.org/drm/intel/issues/2782
[i915#2966]: https://gitlab.freedesktop.org/drm/intel/issues/2966
[i915#3363]: https://gitlab.freedesktop.org/drm/intel/issues/3363
[i915#3462]: https://gitlab.freedesktop.org/drm/intel/issues/3462
[i915#3626]: https://gitlab.freedesktop.org/drm/intel/issues/3626
[i915#541]: https://gitlab.freedesktop.org/drm/intel/issues/541
[k.org#202321]: https://bugzilla.kernel.org/show_bug.cgi?id=202321
Participating hosts (39 -> 36)
------------------------------
Missing (3): fi-ilk-m540 fi-bsw-cyan fi-bdw-samus
Build changes
-------------
* Linux: CI_DRM_10295 -> Patchwork_20494
CI-20190529: 20190529
CI_DRM_10295: 683b7f160eb6993ccfc19e67e3c7111f12946bea @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6124: 357d5477c93f2bdd3354afe91b89ccfd4ee4fd56 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_20494: bde352ace7ae5caa0350095bf3330bb5a783dba0 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
bde352ace7ae drm/i915/gem: Migrate to system at dma-buf map time 3b50433924c8 drm/i915/gem: Make our dma-buf exporter dynamic
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20494/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx