If GUP-ineligible pages are passed to a GEM userptr object, -EFAULT is returned only when the object is actually bound.
The xf86-video-intel userspace driver cannot differentiate this condition, and marks the GPU as wedged. This disables graphics acceleration and may cripple other functionalities such as VT switch. Solve this by "prefaulting" user pages on GEM object creation, testing whether all pages are eligible for get_user_pages() in the process. On failure, return -EFAULT so that userspace can fallback to software bliting. This behavior can be controlled by using a new modparam "gem_userptr_prefault", which is true by default. The only known use for this patch is Qubes OS's GUI virtualization. Userspace is expected to resort to DMA-BUF whenever possible. Signed-off-by: Jinoh Kang <[email protected]> --- drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 36 +++++++++++++++++++++ drivers/gpu/drm/i915/i915_params.c | 3 ++ drivers/gpu/drm/i915/i915_params.h | 1 + 3 files changed, 40 insertions(+) diff --git a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c index f2eaed6aca3d..65596d2b284f 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_userptr.c @@ -712,6 +712,34 @@ static const struct drm_i915_gem_object_ops i915_gem_userptr_ops = { .release = i915_gem_userptr_release, }; +static int i915_gem_userptr_prefault(unsigned long start, + unsigned long nr_pages, + bool readonly) +{ + struct mm_struct *mm = current->mm; + unsigned int gup_flags = (readonly ? 0 : FOLL_WRITE) | FOLL_NOWAIT; + int err = 0; + + down_read(&mm->mmap_sem); + while (nr_pages) { + long ret; + + ret = get_user_pages(start, nr_pages, gup_flags, NULL, NULL); + if (ret < 0) { + err = (int)ret; + break; + } + if (ret == 0) + ret = 1; /* skip this page */ + + start += ret << PAGE_SHIFT; + nr_pages -= ret; + } + up_read(&mm->mmap_sem); + + return err; +} + /* * Creates a new mm object that wraps some normal memory from the process * context - user memory. @@ -796,6 +824,14 @@ i915_gem_userptr_ioctl(struct drm_device *dev, if (!access_ok((char __user *)(unsigned long)args->user_ptr, args->user_size)) return -EFAULT; + if (READ_ONCE(i915_modparams.gem_userptr_prefault)) { + ret = i915_gem_userptr_prefault((unsigned long)args->user_ptr, + args->user_size >> PAGE_SHIFT, + args->flags & I915_USERPTR_READ_ONLY); + if (ret) + return ret; + } + if (args->flags & I915_USERPTR_READ_ONLY) { /* * On almost all of the older hw, we cannot tell the GPU that diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c index 7f139ea4a90b..c39766adeda2 100644 --- a/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c @@ -197,6 +197,9 @@ i915_param_named_unsafe(fake_lmem_start, ulong, 0400, "Fake LMEM start offset (default: 0)"); #endif +i915_param_named(gem_userptr_prefault, bool, 0600, + "Prefault pages when userptr GEM object is created (default:true)"); + static __always_inline void _print_param(struct drm_printer *p, const char *name, const char *type, diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h index 330c03e2b4f7..1169a610a73c 100644 --- a/drivers/gpu/drm/i915/i915_params.h +++ b/drivers/gpu/drm/i915/i915_params.h @@ -79,6 +79,7 @@ struct drm_printer; param(bool, disable_display, false, 0400) \ param(bool, verbose_state_checks, true, 0) \ param(bool, nuclear_pageflip, false, 0400) \ + param(bool, gem_userptr_prefault, true) \ param(bool, enable_dp_mst, true, 0600) \ param(bool, enable_gvt, false, 0400) -- 2.26.2 -- You received this message because you are subscribed to the Google Groups "qubes-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/qubes-devel/62703d3b-f66e-beb2-640b-63104201f24c%40gmail.com.
OpenPGP_signature
Description: OpenPGP digital signature
