media: staging: imgu: do not hold spinlock during freeing mmu page table
Subsystems (3)
PATCH 1/1 media: staging: imgu: do not hold spinlock during freeing mmu page table
The spinlock should not be hold during ImgU page alloc and free, the irq should be enabled during memory cache flush - cpa_flush(). The spinlock should be released before freeing pages table.
Signed-off-by Bingbu Cao <[email protected]>
--- drivers/staging/media/ipu3/ipu3-mmu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/staging/media/ipu3/ipu3-mmu.c +6 -4
@@ -174,8 +174,10 @@ static u32 *imgu_mmu_get_l2pt(struct imgu_mmu *mmu, u32 l1pt_idx)spin_lock_irqsave (&mmu->lock, flags); l2pt = mmu->l2pts[l1pt_idx]; -if (l2pt) - goto done; +if (l2pt) { +spin_unlock_irqrestore (&mmu->lock, flags); +return l2pt; + }spin_unlock_irqrestore (&mmu->lock, flags);
@@ -190,8 +192,9 @@ static u32 *imgu_mmu_get_l2pt(struct imgu_mmu *mmu, u32 l1pt_idx) l2pt = mmu->l2pts[l1pt_idx];if (l2pt) { +spin_unlock_irqrestore (&mmu->lock, flags);imgu_mmu_free_page_table (new_l2pt); - goto done; +return l2pt; } l2pt = new_l2pt;
@@ -200,7 +203,6 @@ static u32 *imgu_mmu_get_l2pt(struct imgu_mmu *mmu, u32 l1pt_idx) pteval =IPU3_ADDR2PTE (virt_to_phys (new_l2pt)); mmu->l1pt[l1pt_idx] = pteval; -done:spin_unlock_irqrestore (&mmu->lock, flags);return l2pt; }
Signature · 1 line
2.7.4
Hi Bingbu,
Quoted 4 lines · Bingbu Cao
The spinlock should not be hold during ImgU page alloc and free, the irq should be enabled during memory cache flush -
cpa_flush(). The spinlock should be released before freeing pages table.
Thanks for the patch! Would be good to explain why it is so.
Otherwise feel free to add
Reviewed-by Tomasz Figa <[email protected]>
Best regards,
Tomasz
Quoted 45 lines
Signed-off-by Bingbu Cao <[email protected]>--- drivers/staging/media/ipu3/ipu3-mmu.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)drivers/staging/media/ipu3/ipu3-mmu.c +6
-5@@ -174,8 +174,10 @@ static u32 *imgu_mmu_get_l2pt(struct imgu_mmu *mmu, u32 l1pt_idx)spin_lock_irqsave (&mmu->lock, flags); l2pt = mmu->l2pts[l1pt_idx]; -if (l2pt) - goto done; +if (l2pt) { +spin_unlock_irqrestore (&mmu->lock, flags); +return l2pt; + }spin_unlock_irqrestore (&mmu->lock, flags);@@ -190,8 +192,9 @@ static u32 *imgu_mmu_get_l2pt(struct imgu_mmu *mmu, u32 l1pt_idx) l2pt = mmu->l2pts[l1pt_idx];if (l2pt) { +spin_unlock_irqrestore (&mmu->lock, flags);imgu_mmu_free_page_table (new_l2pt); - goto done; +return l2pt; } l2pt = new_l2pt;@@ -200,7 +203,6 @@ static u32 *imgu_mmu_get_l2pt(struct imgu_mmu *mmu, u32 l1pt_idx) pteval =IPU3_ADDR2PTE (virt_to_phys (new_l2pt)); mmu->l1pt[l1pt_idx] = pteval; -done:spin_unlock_irqrestore (&mmu->lock, flags);return l2pt; } --2.7.4