From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] dma: pl330: ensure DMA descriptors are zero-initialised
Date: Tue, 10 Dec 2013 19:15:35 +0000 [thread overview]
Message-ID: <20131210191535.GA18218@mudshark.cambridge.arm.com> (raw)
In-Reply-To: <1386007290-13987-1-git-send-email-will.deacon@arm.com>
On Mon, Dec 02, 2013 at 06:01:30PM +0000, Will Deacon wrote:
> I see the following splat with 3.13-rc1 when attempting to perform DMA:
>
> [ 253.004516] Alignment trap: not handling instruction e1902f9f at [<c0204b40>]
> [ 253.004583] Unhandled fault: alignment exception (0x221) at 0xdfdfdfd7
> [ 253.004646] Internal error: : 221 [#1] PREEMPT SMP ARM
> [ 253.004691] Modules linked in: dmatest(+) [last unloaded: dmatest]
> [ 253.004798] CPU: 0 PID: 671 Comm: kthreadd Not tainted 3.13.0-rc1+ #2
> [ 253.004864] task: df9b0900 ti: df03e000 task.ti: df03e000
> [ 253.004937] PC is at dmaengine_unmap_put+0x14/0x34
> [ 253.005010] LR is at pl330_tasklet+0x3c8/0x550
> [ 253.005087] pc : [<c0204b44>] lr : [<c0207478>] psr: a00e0193
> [ 253.005087] sp : df03fe48 ip : 00000000 fp : df03bf18
> [ 253.005178] r10: bf00e108 r9 : 00000001 r8 : 00000000
> [ 253.005245] r7 : df837040 r6 : dfb41800 r5 : df837048 r4 : df837000
> [ 253.005316] r3 : dfdfdfcf r2 : dfb41f80 r1 : df837048 r0 : dfdfdfd7
> [ 253.005384] Flags: NzCv IRQs off FIQs on Mode SVC_32 ISA ARM Segment kernel
> [ 253.005459] Control: 30c5387d Table: 9fb9ba80 DAC: fffffffd
> [ 253.005520] Process kthreadd (pid: 671, stack limit = 0xdf03e248)
>
> This is due to desc->txd.unmap containing garbage (uninitialised memory).
>
> Rather than add another dummy initialisation to _init_desc, instead
> ensure that the descriptors are zero-initialised during allocation and
> remove the dummy, per-field initialisation.
>
> Cc: Andriy Shevchenko <andriy.shevchenko@intel.com>
> Cc: Vinod Koul <vinod.koul@intel.com>
> Cc: Dan Williams <dan.j.williams@intel.com>
> Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
> Signed-off-by: Will Deacon <will.deacon@arm.com>
Ping? It would be great to see this merged as a fix.
Cheers,
Will
> ---
> drivers/dma/pl330.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
> index 98641eaca080..769f865b71db 100644
> --- a/drivers/dma/pl330.c
> +++ b/drivers/dma/pl330.c
> @@ -2492,12 +2492,9 @@ static dma_cookie_t pl330_tx_submit(struct dma_async_tx_descriptor *tx)
>
> static inline void _init_desc(struct dma_pl330_desc *desc)
> {
> - desc->pchan = NULL;
> desc->req.x = &desc->px;
> desc->req.token = desc;
> desc->rqcfg.swap = SWAP_NO;
> - desc->rqcfg.privileged = 0;
> - desc->rqcfg.insnaccess = 0;
> desc->rqcfg.scctl = SCCTRL0;
> desc->rqcfg.dcctl = DCCTRL0;
> desc->req.cfg = &desc->rqcfg;
> @@ -2517,7 +2514,7 @@ static int add_desc(struct dma_pl330_dmac *pdmac, gfp_t flg, int count)
> if (!pdmac)
> return 0;
>
> - desc = kmalloc(count * sizeof(*desc), flg);
> + desc = kcalloc(count, sizeof(*desc), flg);
> if (!desc)
> return 0;
>
> --
> 1.8.2.2
>
next prev parent reply other threads:[~2013-12-10 19:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-02 18:01 [PATCH v2] dma: pl330: ensure DMA descriptors are zero-initialised Will Deacon
2013-12-10 19:15 ` Will Deacon [this message]
2013-12-18 16:31 ` Vinod Koul
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=20131210191535.GA18218@mudshark.cambridge.arm.com \
--to=will.deacon@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).