From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefan Schake Subject: [PATCH 1/2] drm/vc4: Account for interrupts in flight Date: Fri, 10 Nov 2017 02:05:06 +0100 Message-ID: <1510275907-993-2-git-send-email-stschake@gmail.com> References: <1510275907-993-1-git-send-email-stschake@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id AA6C06E9C8 for ; Fri, 10 Nov 2017 01:05:47 +0000 (UTC) Received: by mail-wr0-x241.google.com with SMTP id q66so7208628wrb.13 for ; Thu, 09 Nov 2017 17:05:47 -0800 (PST) In-Reply-To: <1510275907-993-1-git-send-email-stschake@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: David Airlie , linux-rpi-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Stefan Schake List-Id: dri-devel@lists.freedesktop.org U3luY2hyb25vdXNseSBkaXNhYmxlIHRoZSBJUlEgdG8gbWFrZSB0aGUgZm9sbG93aW5nIGNhbmNl bF93b3JrX3N5bmMKaW52b2NhdGlvbiBlZmZlY3RpdmUuCgpBbiBpbnRlcnJ1cHQgaW4gZmxpZ2h0 IGNvdWxkIGVucXVldWUgZnVydGhlciBvdmVyZmxvdyBtZW0gd29yay4gQXMgd2UKZnJlZSB0aGUg YmlubmVyIEJPIGltbWVkaWF0ZWx5IGZvbGxvd2luZyB2YzRfaXJxX3VuaW5zdGFsbCB0aGlzIGNh dXNlZAphIE5VTEwgcG9pbnRlciBkZXJlZmVyZW5jZSBpbiB0aGUgd29yayBjYWxsYmFjayB2YzRf b3ZlcmZsb3dfbWVtX3dvcmsuCgpMaW5rOiBodHRwczovL2dpdGh1Yi5jb20vYW5ob2x0L2xpbnV4 L2lzc3Vlcy8xMTQKU2lnbmVkLW9mZi1ieTogU3RlZmFuIFNjaGFrZSA8c3RzY2hha2VAZ21haWwu Y29tPgpGaXhlczogZDViMWE3OGE3NzJmICgiZHJtL3ZjNDogQWRkIHN1cHBvcnQgZm9yIGRyYXdp bmcgM0QgZnJhbWVzLiIpCi0tLQogZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfaXJxLmMgfCA2ICsr KysrKwogMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS92YzQvdmM0X2lycS5jIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfaXJxLmMK aW5kZXggN2Q3YWYzYS4uNjFiMmU1MyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL3ZjNC92 YzRfaXJxLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL3ZjNC92YzRfaXJxLmMKQEAgLTIwOCw2ICsy MDgsOSBAQAogewogCXN0cnVjdCB2YzRfZGV2ICp2YzQgPSB0b192YzRfZGV2KGRldik7CiAKKwkv KiBVbmRvIHRoZSBlZmZlY3RzIG9mIGEgcHJldmlvdXMgdmM0X2lycV91bmluc3RhbGwuICovCisJ ZW5hYmxlX2lycShkZXYtPmlycSk7CisKIAkvKiBFbmFibGUgYm90aCB0aGUgcmVuZGVyIGRvbmUg YW5kIG91dCBvZiBtZW1vcnkgaW50ZXJydXB0cy4gKi8KIAlWM0RfV1JJVEUoVjNEX0lOVEVOQSwg VjNEX0RSSVZFUl9JUlFTKTsKIApAQCAtMjI1LDYgKzIyOCw5IEBACiAJLyogQ2xlYXIgYW55IHBl bmRpbmcgaW50ZXJydXB0cyB3ZSBtaWdodCBoYXZlIGxlZnQuICovCiAJVjNEX1dSSVRFKFYzRF9J TlRDVEwsIFYzRF9EUklWRVJfSVJRUyk7CiAKKwkvKiBGaW5pc2ggYW55IGludGVycnVwdCBoYW5k bGVyIHN0aWxsIGluIGZsaWdodC4gKi8KKwlkaXNhYmxlX2lycShkZXYtPmlycSk7CisKIAljYW5j ZWxfd29ya19zeW5jKCZ2YzQtPm92ZXJmbG93X21lbV93b3JrKTsKIH0KIAotLSAKMS45LjEKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBt YWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755348AbdKJBFv (ORCPT ); Thu, 9 Nov 2017 20:05:51 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:47393 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755387AbdKJBFr (ORCPT ); Thu, 9 Nov 2017 20:05:47 -0500 X-Google-Smtp-Source: ABhQp+RQRmThpyxecPxxWsDz1P30DK1jzJC4lNzbyJuZ13fPwYW8ERlyIpcpxK1v+O5L1E+GXR3ZuA== From: Stefan Schake To: dri-devel@lists.freedesktop.org Cc: linux-rpi-kernel@lists.infradead.org, Stefan Schake , Eric Anholt , David Airlie , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] drm/vc4: Account for interrupts in flight Date: Fri, 10 Nov 2017 02:05:06 +0100 Message-Id: <1510275907-993-2-git-send-email-stschake@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1510275907-993-1-git-send-email-stschake@gmail.com> References: <1510275907-993-1-git-send-email-stschake@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Synchronously disable the IRQ to make the following cancel_work_sync invocation effective. An interrupt in flight could enqueue further overflow mem work. As we free the binner BO immediately following vc4_irq_uninstall this caused a NULL pointer dereference in the work callback vc4_overflow_mem_work. Link: https://github.com/anholt/linux/issues/114 Signed-off-by: Stefan Schake Fixes: d5b1a78a772f ("drm/vc4: Add support for drawing 3D frames.") --- drivers/gpu/drm/vc4/vc4_irq.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/vc4/vc4_irq.c b/drivers/gpu/drm/vc4/vc4_irq.c index 7d7af3a..61b2e53 100644 --- a/drivers/gpu/drm/vc4/vc4_irq.c +++ b/drivers/gpu/drm/vc4/vc4_irq.c @@ -208,6 +208,9 @@ { struct vc4_dev *vc4 = to_vc4_dev(dev); + /* Undo the effects of a previous vc4_irq_uninstall. */ + enable_irq(dev->irq); + /* Enable both the render done and out of memory interrupts. */ V3D_WRITE(V3D_INTENA, V3D_DRIVER_IRQS); @@ -225,6 +228,9 @@ /* Clear any pending interrupts we might have left. */ V3D_WRITE(V3D_INTCTL, V3D_DRIVER_IRQS); + /* Finish any interrupt handler still in flight. */ + disable_irq(dev->irq); + cancel_work_sync(&vc4->overflow_mem_work); } -- 1.9.1