V4L/DVB: ivtv: Fix race condition for queued udma transfers
authorIan Armstrong <ian@iarmst.demon.co.uk>
Tue, 22 Dec 2009 01:59:26 +0000 (22:59 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 26 Feb 2010 18:10:41 +0000 (15:10 -0300)
There are several DMA related interrupts which wake up the dma_waitq. The udma
routines use this queue while they wait for their transfer to complete. When
woken, the udma routine will check the IVTV_F_I_UDMA_PENDING & IVTV_F_I_UDMA
flags to see if the transfer is still queued or has finished. However, a small
window exists between the IVTV_F_I_UDMA_PENDING flag being cleared and the
IVTV_F_I_UDMA flag being set. Given that the completion of an unrelated DMA
transfer may wake up the udma routine, it's possible for this check to fail
and the udma routine will start unmapping pages when the transfer has only
just started. The result of this is unpredictable.

This fix simply delays the clearing of the IVTV_F_I_UDMA_PENDING flag until
after IVTV_F_I_UDMA has been set.

Signed-off-by: Ian Armstrong <ian@iarmst.demon.co.uk>
Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/ivtv/ivtv-irq.c
drivers/media/video/ivtv/ivtv-udma.c

index cd9db0bf33bf078946d08307a2414b901c9c1cde..ee0cdded69f728591c8059589d4eb20ffd72fd0d 100644 (file)
@@ -940,9 +940,10 @@ irqreturn_t ivtv_irq_handler(int irq, void *dev_id)
                                ivtv_dma_enc_start(s);
                        break;
                }
-               if (i == IVTV_MAX_STREAMS && test_and_clear_bit(IVTV_F_I_UDMA_PENDING, &itv->i_flags)) {
+
+               if (i == IVTV_MAX_STREAMS &&
+                   test_bit(IVTV_F_I_UDMA_PENDING, &itv->i_flags))
                        ivtv_udma_start(itv);
-               }
        }
 
        if ((combo & IVTV_IRQ_DMA) && !test_bit(IVTV_F_I_PIO, &itv->i_flags)) {
index d07ad6c39024774c11cb41c14f451d57b52c6f6d..1daf1dd65bf764d080db02f390ff9cc709c7c6c0 100644 (file)
@@ -213,6 +213,7 @@ void ivtv_udma_start(struct ivtv *itv)
        write_reg_sync(read_reg(IVTV_REG_DMAXFER) | 0x01, IVTV_REG_DMAXFER);
        set_bit(IVTV_F_I_DMA, &itv->i_flags);
        set_bit(IVTV_F_I_UDMA, &itv->i_flags);
+       clear_bit(IVTV_F_I_UDMA_PENDING, &itv->i_flags);
 }
 
 void ivtv_udma_prepare(struct ivtv *itv)