From patchwork Fri Oct 6 18:43:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Wahren X-Patchwork-Id: 9991853 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 939F160231 for ; Sun, 8 Oct 2017 15:42:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DC2A285D5 for ; Sun, 8 Oct 2017 15:42:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 609E7285E0; Sun, 8 Oct 2017 15:42:47 +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=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM 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 D3CCC285D5 for ; Sun, 8 Oct 2017 15:42:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 93BC889F08; Sun, 8 Oct 2017 15:42:42 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.134]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2AE6D6E1BA for ; Fri, 6 Oct 2017 18:43:57 +0000 (UTC) Received: from localhost.localdomain ([95.90.209.33]) by mrelayeu.kundenserver.de (mreue006 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MEOzM-1e7BQm0H84-00FQvU; Fri, 06 Oct 2017 20:43:52 +0200 From: Stefan Wahren To: Eric Anholt , David Airlie Subject: [PATCH] drm: vc4: Fix race during binding Date: Fri, 6 Oct 2017 20:43:03 +0200 Message-Id: <1507315383-8107-1-git-send-email-stefan.wahren@i2se.com> X-Mailer: git-send-email 2.7.4 X-Provags-ID: V03:K0:7mP4XlzU8X4uBlHhUeF8+OpTYwkkUE1lB4X5L31UaORV2JNBxDl 2huY+WgfiGrfUM32nFsJaQWHTQ5z+D5Nc+/6xSk4H+U9qkt9h7aa+So8aNAZulDUF8jR0uu TD6rOYpgLMPrpy5mKORNcaB0YvoImidcJJ0ejVB0qAMDq/csvKWQimGZfxbEeJznZTzkFuG hZX6Zwjm8dxczvbxC7tTg== X-UI-Out-Filterresults: notjunk:1; V01:K0:eYvSOSuS/iw=:M12K+R9p8SjCaSrG/tBwR9 ivpD/fUx0LnMvWnaQMjXP1a5U1D/LpqEsebvcHGTehr+Ap9DDwgvMT2VXynMkIfRLGJZrPvFf bf1630rBIy3TRhbu27opvugB0BAq/f8VhMbwLY0TQia0xN0oQyhtYg2rBvW6cIilnPU1wYL0e cxrpgJVltoLJMLsnl5fxSUxqFFiUvYQedUgqwyGajpId3/CWJlLhUG7q79CQ40/YfQOinnh6j tf1tknHfqxJ2PkYjNl86h/03NOmpW4cUsTNJvKSv0nDEGcPyvisKcfBGi26MW+caQFXw7wVgn TMgM7yWszAHqauxrrM1FpRGt+nrp3izz0X2s25oWVFbnNxL989FEOSf7d11v6lr0Sen8bBo5b nLFAhWUdD7dRHn02B4luG+jYed8sFtu1pOV0WXzR/Gj5pPIKoLcctJkkxzo1gYsjJaOMsFA6M CzUz526CMUU/6tqSOgA5qqScGma33ImKMCy0D93o07LURSsfNZetGm3pkklSD6w3bPbENmeOT Ce3EZoPd7b4Vtfsv7xLU+OotKHeohpclqt74DCmcFU3cUJa6ESCD7FiNg2KG0dkEc3zoZLrsL aoq7VFN5pTT3HO8AoLVp5k/d58Lph1WU8xSgCfwJmBerVJH/rk3YNP53DstdLOXlTYwXI5AZC 26VNxlMxXAAdZBBBcQGCub2zR0+vp697QqUWhQHWkfcuvCB+rcFkqi7s4Za5B/GJuCXn0sT/1 CybtrC7dvWODN/7Yhn4nbxidey1Zek5UZ/7cbQ== X-Mailman-Approved-At: Sun, 08 Oct 2017 15:42:41 +0000 Cc: Stefan Wahren , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP This fixes the race between vc4_overflow_mem_work and the init of the job lock. Otherwise we could trigger a NULL pointer dereference during VC4 binding. Link: https://github.com/anholt/linux/issues/114 Signed-off-by: Stefan Wahren Fixes: d5b1a78a772f ("drm/vc4: Add support for drawing 3D frames.") --- drivers/gpu/drm/vc4/vc4_gem.c | 1 - drivers/gpu/drm/vc4/vc4_irq.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c index d0c6bfb..47d964f 100644 --- a/drivers/gpu/drm/vc4/vc4_gem.c +++ b/drivers/gpu/drm/vc4/vc4_gem.c @@ -1088,7 +1088,6 @@ vc4_gem_init(struct drm_device *dev) INIT_LIST_HEAD(&vc4->render_job_list); INIT_LIST_HEAD(&vc4->job_done_list); INIT_LIST_HEAD(&vc4->seqno_cb_list); - spin_lock_init(&vc4->job_lock); INIT_WORK(&vc4->hangcheck.reset_work, vc4_reset_work); setup_timer(&vc4->hangcheck.timer, diff --git a/drivers/gpu/drm/vc4/vc4_irq.c b/drivers/gpu/drm/vc4/vc4_irq.c index 7d7af3a..d508d13 100644 --- a/drivers/gpu/drm/vc4/vc4_irq.c +++ b/drivers/gpu/drm/vc4/vc4_irq.c @@ -195,6 +195,7 @@ vc4_irq_preinstall(struct drm_device *dev) struct vc4_dev *vc4 = to_vc4_dev(dev); init_waitqueue_head(&vc4->job_wait_queue); + spin_lock_init(&vc4->job_lock); INIT_WORK(&vc4->overflow_mem_work, vc4_overflow_mem_work); /* Clear any pending interrupts someone might have left around