lkml.org 
[lkml]   [2020]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 002/255] drm/i915/gem: Flush coherency domains on first set-domain-ioctl
    Date
    From: Chris Wilson <chris@chris-wilson.co.uk>

    [ Upstream commit 59dd13ad310793757e34afa489dd6fc8544fc3da ]

    Avoid skipping what appears to be a no-op set-domain-ioctl if the cache
    coherency state is inconsistent with our target domain. This also has
    the utility of using the population of the pages to validate the backing
    store.

    The danger in skipping the first set-domain is leaving the cache
    inconsistent and submitting stale data, or worse leaving the clean data
    in the cache and not flushing it to the GPU. The impact should be small
    as it requires a no-op set-domain as the very first ioctl in a
    particular sequence not found in typical userspace.

    Reported-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
    Fixes: 754a25442705 ("drm/i915: Skip object locking around a no-op set-domain ioctl")
    Testcase: igt/gem_mmap_offset/blt-coherency
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
    Cc: Matthew Auld <matthew.william.auld@gmail.com>
    Cc: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
    Cc: <stable@vger.kernel.org> # v5.2+
    Reviewed-by: Matthew Auld <matthew.auld@intel.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20201019203825.10966-1-chris@chris-wilson.co.uk
    (cherry picked from commit 44c2200afcd59f441b43f27829b4003397cc495d)
    Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpu/drm/i915/gem/i915_gem_domain.c | 28 ++++++++++------------
    1 file changed, 13 insertions(+), 15 deletions(-)

    diff --git a/drivers/gpu/drm/i915/gem/i915_gem_domain.c b/drivers/gpu/drm/i915/gem/i915_gem_domain.c
    index 7f76fc68f498a..ba8758011e297 100644
    --- a/drivers/gpu/drm/i915/gem/i915_gem_domain.c
    +++ b/drivers/gpu/drm/i915/gem/i915_gem_domain.c
    @@ -484,21 +484,6 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
    if (!obj)
    return -ENOENT;

    - /*
    - * Already in the desired write domain? Nothing for us to do!
    - *
    - * We apply a little bit of cunning here to catch a broader set of
    - * no-ops. If obj->write_domain is set, we must be in the same
    - * obj->read_domains, and only that domain. Therefore, if that
    - * obj->write_domain matches the request read_domains, we are
    - * already in the same read/write domain and can skip the operation,
    - * without having to further check the requested write_domain.
    - */
    - if (READ_ONCE(obj->write_domain) == read_domains) {
    - err = 0;
    - goto out;
    - }
    -
    /*
    * Try to flush the object off the GPU without holding the lock.
    * We will repeat the flush holding the lock in the normal manner
    @@ -536,6 +521,19 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data,
    if (err)
    goto out;

    + /*
    + * Already in the desired write domain? Nothing for us to do!
    + *
    + * We apply a little bit of cunning here to catch a broader set of
    + * no-ops. If obj->write_domain is set, we must be in the same
    + * obj->read_domains, and only that domain. Therefore, if that
    + * obj->write_domain matches the request read_domains, we are
    + * already in the same read/write domain and can skip the operation,
    + * without having to further check the requested write_domain.
    + */
    + if (READ_ONCE(obj->write_domain) == read_domains)
    + goto out_unpin;
    +
    err = i915_gem_object_lock_interruptible(obj);
    if (err)
    goto out_unpin;
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-11-17 14:52    [W:4.044 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site