Skip to content

Commit 333e11b

Browse files
Joao Pintovinodkoul
authored andcommitted
Avoid hw_desc array overrun in dw-axi-dmac
I have a use case where nr_buffers = 3 and in which each descriptor is composed by 3 segments, resulting in the DMA channel descs_allocated to be 9. Since axi_desc_put() handles the hw_desc considering the descs_allocated, this scenario would result in a kernel panic (hw_desc array will be overrun). To fix this, the proposal is to add a new member to the axi_dma_desc structure, where we keep the number of allocated hw_descs (axi_desc_alloc()) and use it in axi_desc_put() to handle the hw_desc array correctly. Additionally I propose to remove the axi_chan_start_first_queued() call after completing the transfer, since it was identified that unbalance can occur (started descriptors can be interrupted and transfer ignored due to DMA channel not being enabled). Signed-off-by: Joao Pinto <jpinto@synopsys.com> Link: https://lore.kernel.org/r/1711536564-12919-1-git-send-email-jpinto@synopsys.com Signed-off-by: Vinod Koul <vkoul@kernel.org>
1 parent 559a669 commit 333e11b

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ static struct axi_dma_desc *axi_desc_alloc(u32 num)
302302
kfree(desc);
303303
return NULL;
304304
}
305+
desc->nr_hw_descs = num;
305306

306307
return desc;
307308
}
@@ -328,7 +329,7 @@ static struct axi_dma_lli *axi_desc_get(struct axi_dma_chan *chan,
328329
static void axi_desc_put(struct axi_dma_desc *desc)
329330
{
330331
struct axi_dma_chan *chan = desc->chan;
331-
int count = atomic_read(&chan->descs_allocated);
332+
int count = desc->nr_hw_descs;
332333
struct axi_dma_hw_desc *hw_desc;
333334
int descs_put;
334335

@@ -1139,9 +1140,6 @@ static void axi_chan_block_xfer_complete(struct axi_dma_chan *chan)
11391140
/* Remove the completed descriptor from issued list before completing */
11401141
list_del(&vd->node);
11411142
vchan_cookie_complete(vd);
1142-
1143-
/* Submit queued descriptors after processing the completed ones */
1144-
axi_chan_start_first_queued(chan);
11451143
}
11461144

11471145
out:

drivers/dma/dw-axi-dmac/dw-axi-dmac.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ struct axi_dma_desc {
104104
u32 completed_blocks;
105105
u32 length;
106106
u32 period_len;
107+
u32 nr_hw_descs;
107108
};
108109

109110
struct axi_dma_chan_config {

0 commit comments

Comments
 (0)