async-tx: fix buffer sumbission error handling in ipu_idma.c
PATCH 1/1 async-tx: fix buffer sumbission error handling in ipu_idma.c
If submitting new buffer failed, a wrong descriptor gets completed and it doesn't check, if a callback is at all defined, which can lead to an Oops. Fix these bugs and make ipu_update_channel_buffer() void, because it never fails.
--- drivers/dma/ipu/ipu_idmac.c | 24 +++++++----------------- 1 files changed, 7 insertions(+), 17 deletions(-)
drivers/dma/ipu/ipu_idmac.c +7 -17
@@ -761,12 +761,10 @@ static void ipu_select_buffer(enum ipu_channel channel, int buffer_n)* @buffer_n: buffer number to update. * 0 or 1 are the only valid values. * @phyaddr: buffer physical address. -* @return: Returns 0 on success or negative error code on failure. This -* function will fail if the buffer is set to ready. */ /* Called under spin_lock(_irqsave)(&ichan->lock) */ -static int ipu_update_channel_buffer (struct idmac_channel *ichan, -int buffer_n,dma_addr_t phyaddr) +static void ipu_update_channel_buffer (struct idmac_channel *ichan, +int buffer_n,dma_addr_t phyaddr) {enum ipu_channel channel = ichan->dma_chan.chan_id;uint32_t reg;
@@ -806,8 +804,6 @@ static int ipu_update_channel_buffer(struct idmac_channel *ichan, }spin_unlock_irqrestore (&ipu_data.lock, flags); - -return 0 ; }/* Called under spin_lock_irqsave(&ichan->lock) */
@@ -827,14 +823,7 @@ static int ipu_submit_buffer(struct idmac_channel *ichan,* could make it conditional on status >= IPU_CHANNEL_ENABLED, but * doing it again shouldn't hurt either. */ - ret =ipu_update_channel_buffer (ichan, buf_idx, -sg_dma_address (sg)); - -if (ret <0 ) { -dev_err (dev,"Updating sg %p on channel 0x%x buffer %d failed!\n" , - sg, chan_id, buf_idx); -return ret; - } +ipu_update_channel_buffer (ichan, buf_idx,sg_dma_address (sg));ipu_select_buffer (chan_id, buf_idx); dev_dbg(dev, "Updated sg %p on channel 0x%x buffer %d\n",
@@ -1379,10 +1368,11 @@ static irqreturn_t idmac_interrupt(int irq, void *dev_id)if (likely (sgnew) &&ipu_submit_buffer (ichan, descnew, sgnew, ichan->active_buffer) <0 ) { - callback = desc->txd.callback; - callback_param = desc->txd.callback_param; + callback = descnew->txd.callback; + callback_param = descnew->txd.callback_param;spin_unlock (&ichan->lock); -callback (callback_param); +if (callback) +callback (callback_param);spin_lock (&ichan->lock); }
Signature · 1 line
1.6.2.4
PATCH 1/1 async-tx: fix buffer sumbission error handling in ipu_idma.c
Quoted 5 lines · Guennadi Liakhovetski
If submitting new buffer failed, a wrong descriptor gets completed and it doesn't check, if a callback is at all defined, which can lead to an Oops. Fix these bugs and make
ipu_update_channel_buffer()void, because it never fails.Signed-off-by Guennadi Liakhovetski <[email protected]>
Looks like 2.6.33 material. Shall I tag it for -stable as well?
--
Dan
PATCH v2 1/1 async-tx: fix buffer sumbission error handling in ipu_idma.c
If submitting new buffer failed, a wrong descriptor gets completed and it doesn't check, if a callback is at all defined, which can lead to an Oops. Fix these bugs and make ipu_update_channel_buffer() void, because it never fails.
---
v1 -> v2: When fixing Oopses remember to not introduce compiler warnings;)
Quoted 9 lines · Dan Williams
Quoted 5 lines · Guennadi Liakhovetski
If submitting new buffer failed, a wrong descriptor gets completed and it doesn't check, if a callback is at all defined, which can lead to an Oops. Fix these bugs and make
ipu_update_channel_buffer()void, because it never fails.Signed-off-by Guennadi Liakhovetski <[email protected]>Looks like 2.6.33 material. Shall I tag it for -stable as well?
This is more of a theoretical Oops possibility. You have to really try hard to get it - if at all possible. At least I've never seen one and never heard anyone seeing it. So, strictly speaking, I don't think this bug can hurt anyone, but, if Sascha has nothing against this patch, you can push it to stable too.
drivers/dma/ipu/ipu_idmac.c | 25 +++++++------------------ 1 files changed, 7 insertions(+), 18 deletions(-)
drivers/dma/ipu/ipu_idmac.c +7 -18
@@ -761,12 +761,10 @@ static void ipu_select_buffer(enum ipu_channel channel, int buffer_n)* @buffer_n: buffer number to update. * 0 or 1 are the only valid values. * @phyaddr: buffer physical address. -* @return: Returns 0 on success or negative error code on failure. This -* function will fail if the buffer is set to ready. */ /* Called under spin_lock(_irqsave)(&ichan->lock) */ -static int ipu_update_channel_buffer (struct idmac_channel *ichan, -int buffer_n,dma_addr_t phyaddr) +static void ipu_update_channel_buffer (struct idmac_channel *ichan, +int buffer_n,dma_addr_t phyaddr) {enum ipu_channel channel = ichan->dma_chan.chan_id;uint32_t reg;
@@ -806,8 +804,6 @@ static int ipu_update_channel_buffer(struct idmac_channel *ichan, }spin_unlock_irqrestore (&ipu_data.lock, flags); - -return 0 ; }/* Called under spin_lock_irqsave(&ichan->lock) */
@@ -816,7 +812,6 @@ static int ipu_submit_buffer(struct idmac_channel *ichan, {unsigned int chan_id = ichan->dma_chan.chan_id;struct device *dev = &ichan->dma_chan.dev->device; -int ret;if (async_tx_test_ack (&desc->txd))return -EINTR ;
@@ -827,14 +822,7 @@ static int ipu_submit_buffer(struct idmac_channel *ichan,* could make it conditional on status >= IPU_CHANNEL_ENABLED, but * doing it again shouldn't hurt either. */ - ret =ipu_update_channel_buffer (ichan, buf_idx, -sg_dma_address (sg)); - -if (ret <0 ) { -dev_err (dev,"Updating sg %p on channel 0x%x buffer %d failed!\n" , - sg, chan_id, buf_idx); -return ret; - } +ipu_update_channel_buffer (ichan, buf_idx,sg_dma_address (sg));ipu_select_buffer (chan_id, buf_idx); dev_dbg(dev, "Updated sg %p on channel 0x%x buffer %d\n",
@@ -1379,10 +1367,11 @@ static irqreturn_t idmac_interrupt(int irq, void *dev_id)if (likely (sgnew) &&ipu_submit_buffer (ichan, descnew, sgnew, ichan->active_buffer) <0 ) { - callback = desc->txd.callback; - callback_param = desc->txd.callback_param; + callback = descnew->txd.callback; + callback_param = descnew->txd.callback_param;spin_unlock (&ichan->lock); -callback (callback_param); +if (callback) +callback (callback_param);spin_lock (&ichan->lock); }
Signature · 1 line
1.6.2.4
PATCH v2 1/1 async-tx: fix buffer sumbission error handling in ipu_idma.c
Quoted 19 lines · Guennadi Liakhovetski
If submitting new buffer failed, a wrong descriptor gets completed and it doesn't check, if a callback is at all defined, which can lead to an Oops. Fix these bugs and make
ipu_update_channel_buffer()void, because it never fails.Signed-off-by Guennadi Liakhovetski <[email protected]>---
v1 -> v2: When fixing Oopses remember to not introduce compiler warnings;)
Quoted 8 lines · Dan Williams
Quoted 5 lines · Guennadi Liakhovetski
If submitting new buffer failed, a wrong descriptor gets completed and it doesn't check, if a callback is at all defined, which can lead to an Oops. Fix these bugs and make
ipu_update_channel_buffer()void, because it never fails.Signed-off-by Guennadi Liakhovetski <[email protected]>
Quoted 7 lines
Quoted 1 line
Looks like 2.6.33 material. ?Shall I tag it for -stable as well?
This is more of a theoretical Oops possibility. You have to really try hard to get it - if at all possible. At least I've never seen one and never heard anyone seeing it. So, strictly speaking, I don't think this bug can hurt anyone, but, if Sascha has nothing against this patch, you can push it to stable too.
Given the time proximity to 2.6.33-final I'll push it without the stable tag. If we later decide it is needed there it's just a matter of sending Greg a note.
Thanks,
Dan
PATCH v2 1/1 async-tx: fix buffer sumbission error handling in ipu_idma.c
Hello Guennadi,
s/sumbission/submission/ in the Subject
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH v2 1/1 async-tx: fix buffer sumbission error handling in ipu_idma.c
Quoted 3 lines · Uwe Kleine-K?nig
Hello Guennadi,
s/sumbission/submission/ in the Subject
Right, thanks Uwe. Dan, can you fix this when committing or shall I make v3?
Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
PATCH v2 1/1 async-tx: fix buffer sumbission error handling in ipu_idma.c
2010/2/10 Guennadi Liakhovetski <[email protected]>:
Quoted 8 lines · Uwe Kleine-K?nig
Quoted 4 lines
Hello Guennadi,
s/sumbission/submission/ in the Subject
Right, thanks Uwe. Dan, can you fix this when committing or shall I make v3?
I applied it with this fix.
--
Dan