Commit 038c95a3 authored by Michał Winiarski's avatar Michał Winiarski Committed by Chris Wilson

drm/i915: Always convert incoming exec offsets to non-canonical

We're using non-canonical addresses in drm_mm, and we're making sure that
userspace is using canonical addressing - both in case of softpin
(verifying incoming offset) and when relocating (converting to canonical
when updating offset returned to userspace).
Unfortunately when considering the need for relocations, we're comparing
offset from userspace (in canonical form) with drm_mm node (in
non-canonical form), and as a result, we end up always relocating if our
offsets are in the "problematic" range.
Let's always convert the offsets to avoid the performance impact of
relocations.

Fixes: a5f0edf6 ("drm/i915: Avoid writing relocs with addresses in non-canonical form")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michel Thierry <michel.thierry@intel.com>
Reported-by: default avatarMichał Pyrzowski <michal.pyrzowski@intel.com>
Signed-off-by: default avatarMichał Winiarski <michal.winiarski@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170207195559.18798-1-michal.winiarski@intel.comReviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent c0dcb203
...@@ -1185,13 +1185,13 @@ validate_exec_list(struct drm_device *dev, ...@@ -1185,13 +1185,13 @@ validate_exec_list(struct drm_device *dev,
if (exec[i].offset != if (exec[i].offset !=
gen8_canonical_addr(exec[i].offset & PAGE_MASK)) gen8_canonical_addr(exec[i].offset & PAGE_MASK))
return -EINVAL; return -EINVAL;
}
/* From drm_mm perspective address space is continuous, /* From drm_mm perspective address space is continuous,
* so from this point we're always using non-canonical * so from this point we're always using non-canonical
* form internally. * form internally.
*/ */
exec[i].offset = gen8_noncanonical_addr(exec[i].offset); exec[i].offset = gen8_noncanonical_addr(exec[i].offset);
}
if (exec[i].alignment && !is_power_of_2(exec[i].alignment)) if (exec[i].alignment && !is_power_of_2(exec[i].alignment))
return -EINVAL; return -EINVAL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment