From patchwork Fri Jul 6 07:46:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Loic PALLARDY X-Patchwork-Id: 10510951 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 45F8C60532 for ; Fri, 6 Jul 2018 07:47:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38710283C5 for ; Fri, 6 Jul 2018 07:47:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C7A1284BF; Fri, 6 Jul 2018 07:47:56 +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=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6664283C5 for ; Fri, 6 Jul 2018 07:47:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753056AbeGFHrz (ORCPT ); Fri, 6 Jul 2018 03:47:55 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:39971 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752077AbeGFHry (ORCPT ); Fri, 6 Jul 2018 03:47:54 -0400 Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx08-.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id w667hZnx031922; Fri, 6 Jul 2018 09:47:52 +0200 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx08-00178001.pphosted.com with ESMTP id 2k0dnx539w-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 06 Jul 2018 09:47:52 +0200 Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 9D83131; Fri, 6 Jul 2018 07:47:51 +0000 (GMT) Received: from Webmail-eu.st.com (sfhdag7node2.st.com [10.75.127.20]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 509161D84; Fri, 6 Jul 2018 07:47:51 +0000 (GMT) Received: from localhost (10.75.127.47) by SFHDAG7NODE2.st.com (10.75.127.20) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Fri, 6 Jul 2018 09:47:50 +0200 From: Loic Pallardy To: , CC: , , , , Loic Pallardy Subject: [PATCH v2 1/1] remoteproc: correct rproc_free_vring() to avoid invalid kernel paging Date: Fri, 6 Jul 2018 09:46:52 +0200 Message-ID: <1530863212-16584-1-git-send-email-loic.pallardy@st.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [10.75.127.47] X-ClientProxiedBy: SFHDAG3NODE3.st.com (10.75.127.9) To SFHDAG7NODE2.st.com (10.75.127.20) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-07-06_02:, , signatures=0 Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If rproc_start() failed, rproc_resource_cleanup() is called to clean debugfs entries, then associated iommu mappings, carveouts and vdev. Issue occurs when rproc_free_vring() is trying to reset vring resource table entry. At this time, table_ptr is pointing on loaded resource table and carveouts already released, so access to loaded resource table is generating a kernel paging error: [ 12.696535] Unable to handle kernel paging request at virtual address f0f357cc [ 12.696540] pgd = (ptrval) [ 12.696542] [f0f357cc] *pgd=6d2d0811, *pte=00000000, *ppte=00000000 [ 12.696558] Internal error: Oops: 807 [#1] SMP ARM [ 12.696563] Modules linked in: rpmsg_core v4l2_mem2mem videobuf2_dma_contig sti_drm v4l2_common vida [ 12.696598] CPU: 1 PID: 48 Comm: kworker/1:1 Tainted: G W 4.18.0-rc2-00018-g3170fdd-8 [ 12.696602] Hardware name: STi SoC with Flattened Device Tree [ 12.696625] Workqueue: events request_firmware_work_func [ 12.696659] PC is at rproc_free_vring+0x84/0xbc [remoteproc] [ 12.696667] LR is at rproc_free_vring+0x70/0xbc [remoteproc] This patch proposes to simply remove reset of resource table vring entries, as firmware and resource table are reloaded at each rproc boot. rproc_trigger_recovery() not impacted as resources not touched during recovery procedure. Signed-off-by: Loic Pallardy --- Changes from V1: typo fixes in commit message drivers/remoteproc/remoteproc_core.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index a9609d9..9a8b47c 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -289,16 +289,10 @@ void rproc_free_vring(struct rproc_vring *rvring) { int size = PAGE_ALIGN(vring_size(rvring->len, rvring->align)); struct rproc *rproc = rvring->rvdev->rproc; - int idx = rvring->rvdev->vring - rvring; - struct fw_rsc_vdev *rsc; dma_free_coherent(rproc->dev.parent, size, rvring->va, rvring->dma); idr_remove(&rproc->notifyids, rvring->notifyid); - /* reset resource entry info */ - rsc = (void *)rproc->table_ptr + rvring->rvdev->rsc_offset; - rsc->vring[idx].da = 0; - rsc->vring[idx].notifyid = -1; } static int rproc_vdev_do_probe(struct rproc_subdev *subdev)