From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-874563-1516769040-2-4734330363398233210 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516769040; b=GJfMVKLeHvZdbBNCDHS/D4Xid5Mr9uHEnwp2+PSF2doDHJb Pgnd9+K1Okd9lHck8WQBLedvjmTl2rIu5PfNz/8hjTV/ogxm8Ujm7HYWpWnFlcro u/KHooarW4AjbL9P9CCmoauXg6KZC6kX0RjElA4tua/KDZRWcl42zthBNbWiK+oP MhpYMLEoBxTS2uqJLwVyxgEN3tBA1+R1zZnaQrSTPLV+bf38SkMXD9qrrP6HF7WL 7Pw+6VA2v5IC7jYqLlpLjvQYP4niaaBoSTjk/1MkXrClfCjbHf1gHU7Y+1jEM9mx T0IKq0dVbDLVnAcHcwOI4C2A2cN48O6PuK5t0Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :content-type:content-transfer-encoding:mime-version:sender :list-id; s=arctest; t=1516769040; bh=MrLSATAXpGJCSyf4I2KHxZJbwH hXPQD0D5ZqbowSIt4=; b=ulN9pN3HWstmMdus1+X+JjTCZOtgG5H+hsbeaPUclF /maQeDNc5ZEUX47qtL8244TVtlQHmracnIiNYT2j17TWSMOWmG2d0gYxjesB81Gp 6uBRs3B7BPHz5mpWO4qc2MNv4f998Gz3wrnHUksV2miI94P4H+Ac7IvcAxKrinOn XpSGjO8RWdDAQKMRJBxUxl/bXQF25/rTXGywJJLriRwkmbhNydGBviIRQgehquyd EX3OrIieJFitQY89cX9ExFTulCG/49weHFm9nG+GVqkzS4Ua4/OG77Yb9nU05N12 tfO5OBknaiaVYorVav8BnE2EaRE+Fe1tjz7Ri+iyU8Ew== ARC-Authentication-Results: i=1; mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=UV3d7XYl x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx3.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=UV3d7XYl x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932287AbeAXEnn (ORCPT ); Tue, 23 Jan 2018 23:43:43 -0500 Received: from mail-sn1nam01on0134.outbound.protection.outlook.com ([104.47.32.134]:5532 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932651AbeAXEQt (ORCPT ); Tue, 23 Jan 2018 23:16:49 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Stefan Schake , Eric Anholt , "Sasha Levin" Subject: [PATCH AUTOSEL for 4.9 01/55] drm/vc4: Account for interrupts in flight Thread-Topic: [PATCH AUTOSEL for 4.9 01/55] drm/vc4: Account for interrupts in flight Thread-Index: AQHTlMn3sm8lvDSBIkuvlg7ZcQWKNg== Date: Wed, 24 Jan 2018 04:15:28 +0000 Message-ID: <20180124041521.32223-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB0727;7:pb66ADaEcNuvqdSaJbz/tfuL5uhjuHJ4j23jdsCK9uTUUznqC4TUBui53lcrbYbPsBXiDW/A03Tt2pPsfMmlGbGafGKU/+t6BRbuuuaUEjAV7qezGP+zPiz06GMSk3qxPr7v2XEb8I4kHcqt3zv0xwXz5T1W5qqsCZHGKvbSQxxn9esuN1q9RR0lyNWIakzRxRaSsgydjV4vIOzoRI5qA16G4Ra8MHgR6t5RPvkb+XwBmVPCF1XlbS1B8NqxHEOe x-ms-office365-filtering-correlation-id: 820ca4c7-aaf2-4ad4-0868-08d562e145de x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020);SRVR:DM5PR2101MB0727; x-ms-traffictypediagnostic: DM5PR2101MB0727: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(166708455590820)(85827821059158); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(5005006)(8121501046)(3231046)(2400081)(944501161)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041288)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011);SRVR:DM5PR2101MB0727;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB0727; x-forefront-prvs: 056297E276 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(396003)(366004)(39380400002)(39860400002)(376002)(189003)(199004)(86612001)(6506007)(106356001)(59450400001)(6346003)(54906003)(575784001)(86362001)(2501003)(110136005)(966005)(1076002)(7736002)(5250100002)(3660700001)(316002)(26005)(102836004)(6666003)(99286004)(97736004)(22452003)(107886003)(6436002)(53936002)(478600001)(66066001)(14454004)(6306002)(2900100001)(6512007)(2906002)(5660300001)(8936002)(4326008)(10290500003)(305945005)(39060400002)(325944009)(10090500001)(68736007)(25786009)(81166006)(72206003)(36756003)(8676002)(81156014)(3846002)(6116002)(3280700002)(105586002)(6486002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB0727;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: Hml4uIXpVa1TXvTAdC1acnEUzgfVNd5fUwqk4vy66dajaYrv7Hnq/Rptb3M/Df61JfMfrC0W8/QGNKOx1BrJHA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 820ca4c7-aaf2-4ad4-0868-08d562e145de X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Jan 2018 04:15:28.3291 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0727 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Stefan Schake [ Upstream commit 253696ccd613fbdaa5aba1de44c461a058e0a114 ] 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.") Signed-off-by: Eric Anholt Reviewed-by: Eric Anholt Link: https://patchwork.freedesktop.org/patch/msgid/1510275907-993-2-git-se= nd-email-stschake@gmail.com Signed-off-by: Sasha Levin --- 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 094bc6a475c1..d45a7c0a7915 100644 --- a/drivers/gpu/drm/vc4/vc4_irq.c +++ b/drivers/gpu/drm/vc4/vc4_irq.c @@ -208,6 +208,9 @@ vc4_irq_postinstall(struct drm_device *dev) { struct vc4_dev *vc4 =3D to_vc4_dev(dev); =20 + /* 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); =20 @@ -225,6 +228,9 @@ vc4_irq_uninstall(struct drm_device *dev) /* Clear any pending interrupts we might have left. */ V3D_WRITE(V3D_INTCTL, V3D_DRIVER_IRQS); =20 + /* Finish any interrupt handler still in flight. */ + disable_irq(dev->irq); + cancel_work_sync(&vc4->overflow_mem_work); } =20 --=20 2.11.0