From: Loic Pallardy <loic.pallardy@st.com>
To: <bjorn.andersson@linaro.org>, <ohad@wizery.com>
Cc: <linux-remoteproc@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <arnaud.pouliquen@st.com>,
<benjamin.gaignard@linaro.org>,
Loic Pallardy <loic.pallardy@st.com>
Subject: [PATCH v2 1/1] remoteproc: correct rproc_free_vring() to avoid invalid kernel paging
Date: Fri, 6 Jul 2018 09:46:52 +0200 [thread overview]
Message-ID: <1530863212-16584-1-git-send-email-loic.pallardy@st.com> (raw)
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 <loic.pallardy@st.com>
---
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)
--
1.9.1
next reply other threads:[~2018-07-06 7:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-06 7:46 Loic Pallardy [this message]
2018-07-25 22:08 ` [PATCH v2 1/1] remoteproc: correct rproc_free_vring() to avoid invalid kernel paging Suman Anna
2018-07-26 7:48 ` Loic PALLARDY
2018-07-26 23:51 ` Suman Anna
2018-07-27 1:17 ` Suman Anna
2018-07-27 7:10 ` Loic PALLARDY
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1530863212-16584-1-git-send-email-loic.pallardy@st.com \
--to=loic.pallardy@st.com \
--cc=arnaud.pouliquen@st.com \
--cc=benjamin.gaignard@linaro.org \
--cc=bjorn.andersson@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=ohad@wizery.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).