From patchwork Sat Dec 31 12:06:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9492667 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E634962ABB for ; Sat, 31 Dec 2016 12:07:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF1D0223A6 for ; Sat, 31 Dec 2016 12:07:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A40FD252D5; Sat, 31 Dec 2016 12:07:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1A37A223A6 for ; Sat, 31 Dec 2016 12:07:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 81C986E2E8; Sat, 31 Dec 2016 12:07:25 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id D3EEF6E2E3; Sat, 31 Dec 2016 12:07:12 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id m203so74926113wma.3; Sat, 31 Dec 2016 04:07:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=mM3Exd/kqq8Wwx+7XrPJ6lvuNYyAmVGW42oA9mfq5kE=; b=XfWrtpt3rZ1zV/i8nAhTIwmJGUXE6zJS40do6iHovcw+rbwDuFcns4ttwSwj+nih3R riEUkAg93Ix1AxqDHpj21rVdS51cNJwqzKTrOQE5sNW9h1V1Z6rumQaDYW4sEbih5WAq TCL8GiRBz66wibJQLLKiH7zoVChcMia/QiwMvtCf81D6/lApJZhbxvz24iCnYZ2GXcHA 4zmQxCwL1He1fSAk2IFvIsrgfCROSvSE8J4HdQecM8whG84+zC+/8n6Nf4axsD2m8xuj ilm30P+VGRYQMBsb7B7EDIcz4wdYgZ3NFWtNWJpeXBEbWUQTKn92spfADwdCp23pW7Px nZ2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=mM3Exd/kqq8Wwx+7XrPJ6lvuNYyAmVGW42oA9mfq5kE=; b=QMg2REqh2ogxG1aXK4k33Qvqd4cXz6dcKSiJW8yFOixMut3zk0J3CbgI/B00JVooT/ 15iukfqU8+6N4K0QXHWBLRAWRvgH/aaz8ipNGoJkYImywNuuK6prCvNtOZQjuZSAAmHo pBm4qpPa3oVdy5uwR0Fh13Y33UwZrxmP3vRhNolSgop4phGiQfox8Ig7JNIsuimPELFi YnCku2tKtTOLzl1zYrrWSoP3hy2mAYcMikCeuk0p12dwi11A5x77K0DC81uX5ifti5WC iEHA/GL1dOO/TEVGZf3gLZEpEaYX9nd84OELXO1hLgUqMe7V0YeDmsdXUNkHZI2omrPy UBgg== X-Gm-Message-State: AIkVDXL+MVXoJW/Hji7kmztKM4QM18MlZBRGzTC8RKrz/9Ja6JTszBaTNEmRsqDBC40qww== X-Received: by 10.28.15.138 with SMTP id 132mr41156388wmp.41.1483186030966; Sat, 31 Dec 2016 04:07:10 -0800 (PST) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id c81sm74411987wmf.22.2016.12.31.04.07.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Dec 2016 04:07:10 -0800 (PST) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Sat, 31 Dec 2016 12:06:43 +0000 Message-Id: <20161231120702.21204-8-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20161231120702.21204-1-chris@chris-wilson.co.uk> References: <20161231120702.21204-1-chris@chris-wilson.co.uk> Cc: drm-intel-fixes@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 07/26] drm/i915: Fix phys pwrite for struct_mutex-less operation X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Since commit fe115628d567 ("drm/i915: Implement pwrite without struct-mutex") the lowlevel pwrite calls are now called without the protection of struct_mutex, but pwrite_phys was still asserting that it held the struct_mutex and later tried to drop and relock it. Fixes: fe115628d567 ("drm/i915: Implement pwrite without struct-mutex") Signed-off-by: Chris Wilson Cc: Joonas Lahtinen Cc: --- drivers/gpu/drm/i915/i915_gem.c | 34 ++++------------------------------ 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 2957c96eb93d..e5b4a72645d4 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -597,47 +597,21 @@ i915_gem_phys_pwrite(struct drm_i915_gem_object *obj, struct drm_i915_gem_pwrite *args, struct drm_file *file) { - struct drm_device *dev = obj->base.dev; void *vaddr = obj->phys_handle->vaddr + args->offset; char __user *user_data = u64_to_user_ptr(args->data_ptr); - int ret; /* We manually control the domain here and pretend that it * remains coherent i.e. in the GTT domain, like shmem_pwrite. */ - lockdep_assert_held(&obj->base.dev->struct_mutex); - ret = i915_gem_object_wait(obj, - I915_WAIT_INTERRUPTIBLE | - I915_WAIT_LOCKED | - I915_WAIT_ALL, - MAX_SCHEDULE_TIMEOUT, - to_rps_client(file)); - if (ret) - return ret; - intel_fb_obj_invalidate(obj, ORIGIN_CPU); - if (__copy_from_user_inatomic_nocache(vaddr, user_data, args->size)) { - unsigned long unwritten; - - /* The physical object once assigned is fixed for the lifetime - * of the obj, so we can safely drop the lock and continue - * to access vaddr. - */ - mutex_unlock(&dev->struct_mutex); - unwritten = copy_from_user(vaddr, user_data, args->size); - mutex_lock(&dev->struct_mutex); - if (unwritten) { - ret = -EFAULT; - goto out; - } - } + if (copy_from_user(vaddr, user_data, args->size)) + return -EFAULT; drm_clflush_virt_range(vaddr, args->size); - i915_gem_chipset_flush(to_i915(dev)); + i915_gem_chipset_flush(to_i915(obj->base.dev)); -out: intel_fb_obj_flush(obj, false, ORIGIN_CPU); - return ret; + return 0; } void *i915_gem_object_alloc(struct drm_i915_private *dev_priv)