From patchwork Tue Oct 9 11:19:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Christian_K=C3=B6nig?= X-Patchwork-Id: 10632345 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 BC030112B for ; Tue, 9 Oct 2018 11:19:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CB0228A47 for ; Tue, 9 Oct 2018 11:19:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 90ACA28A73; Tue, 9 Oct 2018 11:19:48 +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,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,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 4EF4F28A6E for ; Tue, 9 Oct 2018 11:19:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6CAAA6E269; Tue, 9 Oct 2018 11:19:47 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id E59AC6E269 for ; Tue, 9 Oct 2018 11:19:42 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id w5-v6so1392363wrt.2 for ; Tue, 09 Oct 2018 04:19:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gOT7C2cA5KaJmMclbupWYX3q26z5ozMUETS4efFXHNU=; b=s4HBY+fLiCo3Y7HB7nVe/yV0h4LfbaxgBZTBo4ECRoWGhqWwP+iu4uxWDT7CfPZyRf Lezqonrr9nFZj3tekobvoEwIoheWILVuuLHMMyB6pPftfKJURznTNWVAbmi/OqIC8XuR Xja8ioY+I1Si00j1aos+5Lr3B9ljjf+iio/pvJ6emNLnSX7uml877LyYPwzU5jdAn1fP QOXgjKiu8l+fJBodf7wVgRRdtprb/qT7zk+4WUj6Rg2w+m/FmZLjcsTg+O2kvPfI1N7c UPp13zS4VC0ILqMKEGMxCGg6lRli1Hw4KdJTidD5IkXx3F38dAAPNqD0SXAbOb1GUszL owGg== X-Gm-Message-State: ABuFfohW5atvyRBP6WbVefK9iK4yAaHXcb0bYfk3pNT3f+hsiEWobry+ 4xN+0kBfB8QZh9UKDpJQl+EKJxs/ X-Google-Smtp-Source: ACcGV63+4nC2Y9AiLsFFMh265uTSPnluxVc67+v/S0q2Xo5VFfJZPrJl+P0UWTHM36UigrQbf8E6KQ== X-Received: by 2002:adf:b109:: with SMTP id l9-v6mr18966055wra.101.1539083981316; Tue, 09 Oct 2018 04:19:41 -0700 (PDT) Received: from baker.fritz.box ([2a02:908:1257:4460:9095:a830:b5cf:d5ff]) by smtp.gmail.com with ESMTPSA id b139-v6sm29534987wmd.36.2018.10.09.04.19.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Oct 2018 04:19:40 -0700 (PDT) From: " =?utf-8?q?Christian_K=C3=B6nig?= " X-Google-Original-From: =?utf-8?q?Christian_K=C3=B6nig?= To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/2] drm/sched: fix timeout handling v2 Date: Tue, 9 Oct 2018 13:19:38 +0200 Message-Id: <20181009111938.6872-2-christian.koenig@amd.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20181009111938.6872-1-christian.koenig@amd.com> References: <20181009111938.6872-1-christian.koenig@amd.com> 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP We need to make sure that we don't race between job completion and timeout. v2: put revert label after calling the handling manually Signed-off-by: Christian König Reviewed-by: Nayan Deshmukh --- drivers/gpu/drm/scheduler/sched_main.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/scheduler/sched_main.c index bd7d11c47202..44fe587aaef9 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -249,13 +249,41 @@ 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) - job->sched->ops->timedout_job(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); } /**