From patchwork Thu Nov 8 16:04:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eric Anholt X-Patchwork-Id: 10674549 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E075514BD for ; Thu, 8 Nov 2018 16:04:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D03CA2DC40 for ; Thu, 8 Nov 2018 16:04:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C4A4A2DC77; Thu, 8 Nov 2018 16:04:30 +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=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED 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 5B0162DC40 for ; Thu, 8 Nov 2018 16:04:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B75D589F92; Thu, 8 Nov 2018 16:04:27 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from anholt.net (anholt.net [50.246.234.109]) by gabe.freedesktop.org (Postfix) with ESMTP id 517C4893C9 for ; Thu, 8 Nov 2018 16:04:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id 13C3D10A1314; Thu, 8 Nov 2018 08:04:25 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at anholt.net Received: from anholt.net ([127.0.0.1]) by localhost (kingsolver.anholt.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id CLRm8vxMDk-K; Thu, 8 Nov 2018 08:04:23 -0800 (PST) Received: from eliezer.anholt.net (localhost [127.0.0.1]) by anholt.net (Postfix) with ESMTP id 1076E10A04D0; Thu, 8 Nov 2018 08:04:23 -0800 (PST) Received: by eliezer.anholt.net (Postfix, from userid 1000) id 511812FE1B8E; Thu, 8 Nov 2018 08:04:22 -0800 (PST) From: Eric Anholt To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/2] Revert "drm/sched: fix timeout handling v2" Date: Thu, 8 Nov 2018 08:04:21 -0800 Message-Id: <20181108160422.17743-2-eric@anholt.net> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181108160422.17743-1-eric@anholt.net> References: <20181108160422.17743-1-eric@anholt.net> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nayan Deshmukh , Alex Deucher , linux-kernel@vger.kernel.org, =?utf-8?q?Christian_K=C3=B6nig?= Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit 0efd2d2f68cd5dbddf4ecd974c33133257d16a8e. Fixes this failure in V3D GPU reset: [ 1418.227796] Unable to handle kernel NULL pointer dereference at virtual address 00000018 [ 1418.235947] pgd = dc4c55ca [ 1418.238695] [00000018] *pgd=80000040004003, *pmd=00000000 [ 1418.244132] Internal error: Oops: 206 [#1] SMP ARM [ 1418.248934] Modules linked in: [ 1418.252001] CPU: 0 PID: 10253 Comm: kworker/0:0 Not tainted 4.19.0-rc6+ #486 [ 1418.259058] Hardware name: Broadcom STB (Flattened Device Tree) [ 1418.265002] Workqueue: events drm_sched_job_timedout [ 1418.269986] PC is at dma_fence_remove_callback+0x8/0x50 [ 1418.275218] LR is at drm_sched_job_timedout+0x4c/0x118 ... [ 1418.415891] [] (dma_fence_remove_callback) from [] (drm_sched_job_timedout+0x4c/0x118) [ 1418.425571] [] (drm_sched_job_timedout) from [] (process_one_work+0x2c8/0x7bc) [ 1418.434552] [] (process_one_work) from [] (worker_thread+0x44/0x590) [ 1418.442663] [] (worker_thread) from [] (kthread+0x160/0x168) [ 1418.450076] [] (kthread) from [] (ret_from_fork+0x14/0x28) Cc: Christian König Cc: Nayan Deshmukh Cc: Alex Deucher Signed-off-by: Eric Anholt --- drivers/gpu/drm/scheduler/sched_main.c | 30 +------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index 44fe587aaef9..bd7d11c47202 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -249,41 +249,13 @@ static void drm_sched_job_timedout(struct work_struct *work) { struct drm_gpu_scheduler *sched; struct drm_sched_job *job; - int r; sched = container_of(work, struct drm_gpu_scheduler, work_tdr.work); - - spin_lock(&sched->job_list_lock); - list_for_each_entry_reverse(job, &sched->ring_mirror_list, node) { - struct drm_sched_fence *fence = job->s_fence; - - if (!dma_fence_remove_callback(fence->parent, &fence->cb)) - goto already_signaled; - } - job = list_first_entry_or_null(&sched->ring_mirror_list, struct drm_sched_job, node); - spin_unlock(&sched->job_list_lock); if (job) - sched->ops->timedout_job(job); - - spin_lock(&sched->job_list_lock); - list_for_each_entry(job, &sched->ring_mirror_list, node) { - struct drm_sched_fence *fence = job->s_fence; - - if (!fence->parent || !list_empty(&fence->cb.node)) - continue; - - r = dma_fence_add_callback(fence->parent, &fence->cb, - drm_sched_process_job); - if (r) - drm_sched_process_job(fence->parent, &fence->cb); - -already_signaled: - ; - } - spin_unlock(&sched->job_list_lock); + job->sched->ops->timedout_job(job); } /**