Skip to contentSkip to conversation

media: staging: imgu: do not hold spinlock during freeing mmu page table

PATCH Superseded Bingbu Cao 2 participants 2 messages Mar 23, 2020

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Bingbu Cao

author
#0 lore raw

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.

---
 drivers/staging/media/ipu3/ipu3-mmu.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/staging/media/ipu3/ipu3-mmu.c +6 -4
index 5f3ff964f3e7..cb9bf5fb29a5 100644
@@ -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
Reviewed-by on v1 1/1
#1 lore raw

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

Best regards,
Tomasz

Quoted 45 lines
---
 drivers/staging/media/ipu3/ipu3-mmu.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/staging/media/ipu3/ipu3-mmu.c +6 -5
index 5f3ff964f3e7..cb9bf5fb29a5 100644
@@ -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