Received: by 10.223.185.116 with SMTP id b49csp4172603wrg; Mon, 26 Feb 2018 12:31:24 -0800 (PST) X-Google-Smtp-Source: AG47ELvQYgM4AIHKy+ozPIF/HvSi9hmjII2IEUCTVE1DEPkpUCE51TkpOuwyvXHJ3nUSW3O/CbK2 X-Received: by 2002:a17:902:1e4:: with SMTP id b91-v6mr3119579plb.438.1519677084522; Mon, 26 Feb 2018 12:31:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519677084; cv=none; d=google.com; s=arc-20160816; b=WfTZXxBgR3ng/MFapCqZuGC1S95aXvUGxdEtdk6mJjMp8XGa2iXEKJPoOGVCcRxKA8 1frTbKRfELCQZ07h/DgJJaNbBhYsrecI1DWYuyWIuVVtdoTHLb/4owifY8CXM1P2qP9b ZPXqcNdehbwplviiS9xmy3FEitiBOof3yJYYn42EcX1GfXSiUwltL1iDBB2koaeooURE 8/TR0VUGnSRDG6lSB5MZBcvLGEgTiASDNk49Qovxyto7do7sVW4tsYf+HrGx9KmxHEay 5CvuEmbTYkfg9IL2YYg1pmwwCsz7aZ5LjGyE3XoJFlFhAN1iJ4fjNpCNW36qLaJJvvkD 1vkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=IxE3RGNyRask2fMVvzG8Sys48QSRj5Rs+lImdwFRN+w=; b=h7SWu+LYoGsD6CZZnhByv14GsuMtaaXaEYDsnK0uu8HdD5LzDiSVzei3CK7JuSFzlH VS70F6VxyXtCKf7jHltW9TK4p13a53KmgZssbjUxdkMUBD30Ck62nXVeNO07t65fWBod TifZwtIOzqLg/g3peA6Z9UfIQKL4+yk/7VBg4d2vAeQkqpSXP8laVjNuxpGUuROKgXMo 8G73n//5181fyRESlRbPptNGaH4Ew7ozKOxNbVrXuDoejQB0Mly/v/wi4YJMsSPgaIcJ IfstcazNImPVoHtQMPr6ndXYYbNa+AwRxjAUTIFHNUlhz2AcdtDZG0fLLizSFlIO5jjT +b5g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t61-v6si7323314plb.195.2018.02.26.12.31.08; Mon, 26 Feb 2018 12:31:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932148AbeBZUaB (ORCPT + 99 others); Mon, 26 Feb 2018 15:30:01 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:37564 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753438AbeBZU3Y (ORCPT ); Mon, 26 Feb 2018 15:29:24 -0500 Received: from localhost (clnet-b04-243.ikbnet.co.at [83.175.124.243]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id EDE34ED8; Mon, 26 Feb 2018 20:29:23 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chris Wilson , Tvrtko Ursulin , Joonas Lahtinen , Tvrtko Ursulin , Rodrigo Vivi Subject: [PATCH 4.15 64/64] drm/i915/breadcrumbs: Ignore unsubmitted signalers Date: Mon, 26 Feb 2018 21:22:41 +0100 Message-Id: <20180226202156.178016266@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180226202153.453363333@linuxfoundation.org> References: <20180226202153.453363333@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chris Wilson commit 117172c8f9d40ba1de8cb35c6e614422faa03330 upstream. When a request is preempted, it is unsubmitted from the HW queue and removed from the active list of breadcrumbs. In the process, this however triggers the signaler and it may see the clear rbtree with the old, and still valid, seqno, or it may match the cleared seqno with the now zero rq->global_seqno. This confuses the signaler into action and signaling the fence. Fixes: d6a2289d9d6b ("drm/i915: Remove the preempted request from the execution queue") Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Cc: Joonas Lahtinen Cc: # v4.12+ Reviewed-by: Tvrtko Ursulin Link: https://patchwork.freedesktop.org/patch/msgid/20180206094633.30181-1-chris@chris-wilson.co.uk (cherry picked from commit fd10e2ce9905030d922e179a8047a4d50daffd8e) Signed-off-by: Rodrigo Vivi Link: https://patchwork.freedesktop.org/patch/msgid/20180213090154.17373-1-chris@chris-wilson.co.uk Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/intel_breadcrumbs.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) --- a/drivers/gpu/drm/i915/intel_breadcrumbs.c +++ b/drivers/gpu/drm/i915/intel_breadcrumbs.c @@ -552,29 +552,16 @@ void intel_engine_remove_wait(struct int spin_unlock_irq(&b->rb_lock); } -static bool signal_valid(const struct drm_i915_gem_request *request) -{ - return intel_wait_check_request(&request->signaling.wait, request); -} - static bool signal_complete(const struct drm_i915_gem_request *request) { if (!request) return false; - /* If another process served as the bottom-half it may have already - * signalled that this wait is already completed. - */ - if (intel_wait_complete(&request->signaling.wait)) - return signal_valid(request); - - /* Carefully check if the request is complete, giving time for the + /* + * Carefully check if the request is complete, giving time for the * seqno to be visible or if the GPU hung. */ - if (__i915_request_irq_complete(request)) - return true; - - return false; + return __i915_request_irq_complete(request); } static struct drm_i915_gem_request *to_signaler(struct rb_node *rb) @@ -617,9 +604,13 @@ static int intel_breadcrumbs_signaler(vo request = i915_gem_request_get_rcu(request); rcu_read_unlock(); if (signal_complete(request)) { - local_bh_disable(); - dma_fence_signal(&request->fence); - local_bh_enable(); /* kick start the tasklets */ + if (!test_bit(DMA_FENCE_FLAG_SIGNALED_BIT, + &request->fence.flags)) { + local_bh_disable(); + dma_fence_signal(&request->fence); + GEM_BUG_ON(!i915_gem_request_completed(request)); + local_bh_enable(); /* kick start the tasklets */ + } spin_lock_irq(&b->rb_lock);