From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68451C3A5A9 for ; Mon, 4 May 2020 18:05:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 38C93206B8 for ; Mon, 4 May 2020 18:05:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588615513; bh=W7UAXwWN98Y7sZvTBZNeOKlsGspGEzBV6VrCaOG4pXg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QvqrK5UGSdppp+JZpI7bxzMIU7k4GUHCEZa1SHhfQLiOCYda8Lif1iWixnFZTKqW/ rtcNLRniZL3e/GFkocRco9/0A2IFpJN/VAhM2pEsaRgPWHCUCen6BkgaK69ggAhUig 6RaWWbKelIevI3H2T5SvbrtxY0/y5efBWl+L9/VQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731226AbgEDSFM (ORCPT ); Mon, 4 May 2020 14:05:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:34790 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731773AbgEDSFH (ORCPT ); Mon, 4 May 2020 14:05:07 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5C92D2075A; Mon, 4 May 2020 18:05:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588615506; bh=W7UAXwWN98Y7sZvTBZNeOKlsGspGEzBV6VrCaOG4pXg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EqhFFbmpE5tx5Ij+mENJbTJoodQAoIMGl3eG54Q/Zk0OETw+4v7gGaTtUMWzK/S3u o1GTbKEurkm0Y3uMS9pyNTBeV8nbHxXBWvyc8fOspSnsxmasFEkhZe1csfW70T5F1d F5LQFj2D+djel2ND4M7XkbCR1eQeA77Nqi3VV2eo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Christian=20K=C3=B6nig?= , Andrey Grodzovsky , Kent Russell , Linus Torvalds Subject: [PATCH 5.6 01/73] drm/scheduler: fix drm_sched_get_cleanup_job Date: Mon, 4 May 2020 19:57:04 +0200 Message-Id: <20200504165501.981305028@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200504165501.781878940@linuxfoundation.org> References: <20200504165501.781878940@linuxfoundation.org> User-Agent: quilt/0.66 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christian König commit 8623b5255ae7ccaf276aac3920787bf575fa6b37 upstream. We are racing to initialize sched->thread here, just always check the current thread. Signed-off-by: Christian König Reviewed-by: Andrey Grodzovsky Reviewed-by: Kent Russell Link: https://patchwork.freedesktop.org/patch/361303/ Cc: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/scheduler/sched_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -687,7 +687,7 @@ drm_sched_get_cleanup_job(struct drm_gpu */ if ((sched->timeout != MAX_SCHEDULE_TIMEOUT && !cancel_delayed_work(&sched->work_tdr)) || - __kthread_should_park(sched->thread)) + kthread_should_park()) return NULL; spin_lock_irqsave(&sched->job_list_lock, flags);