Skip to contentSkip to conversation

drivers/dax: Avoiding potential deadlock

PATCH In review Pushkar Jambhlekar 2 participants 3 messages Apr 11, 2017 Device direct access (DAX)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/dax: Avoiding potential deadlock

dax_dev_huge_fault returning without releasing lock. Making code change to avoid this situation

---
 drivers/dax/dax.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dax/dax.c +1 -1
index 0d1ca24..fd9c4db 100644
@@ -590,7 +590,7 @@ static int dax_dev_huge_fault(struct vm_fault *vmf,
 		rc = __dax_dev_pud_fault(dax_dev, vmf);
 		break;
 	default:
-		return VM_FAULT_FALLBACK;
+		rc = VM_FAULT_FALLBACK;
 	}
 	rcu_read_unlock();
 
Signature · 1 line
2.7.4
#1 lore raw
Quoted 12 lines · Pushkar Jambhlekar

dax_dev_huge_fault returning without releasing lock. Making code change to avoid this situation

---
 drivers/dax/dax.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dax/dax.c +0 -0
index 0d1ca24..fd9c4db 100644

drivers/dax/dax.c static int dax_dev_huge_fault(struct vm_fault *vmf, · line 593

Quoted 5 lines
drivers/dax/dax.c +1 -1
@@ -590,7 +590,7 @@ static int dax_dev_huge_fault(struct vm_fault *vmf,
                rc = __dax_dev_pud_fault(dax_dev, vmf);
                break;
        default:
-               return VM_FAULT_FALLBACK;
+               rc = VM_FAULT_FALLBACK;

Thanks for the fix! Luckily we never take that branch, but we should fix it so we don't trip over it in some future where there are more fault sizes than pte, pmd, and pud. However, it should be setting rc to VM_FAULT_SIGBUS on an unknown / unsupported fault size.

#2 lore raw

Sent out another patch to correct return value.

Quoted 24 lines · Dan Williams
Quoted 12 lines · Pushkar Jambhlekar

dax_dev_huge_fault returning without releasing lock. Making code change to avoid this situation

---
 drivers/dax/dax.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dax/dax.c +0 -0
index 0d1ca24..fd9c4db 100644

drivers/dax/dax.c static int dax_dev_huge_fault(struct vm_fault *vmf, · line 593

Quoted 5 lines
drivers/dax/dax.c +1 -1
@@ -590,7 +590,7 @@ static int dax_dev_huge_fault(struct vm_fault *vmf,
                rc = __dax_dev_pud_fault(dax_dev, vmf);
                break;
        default:
-               return VM_FAULT_FALLBACK;
+               rc = VM_FAULT_FALLBACK;

Thanks for the fix! Luckily we never take that branch, but we should fix it so we don't trip over it in some future where there are more fault sizes than pte, pmd, and pud. However, it should be setting rc to VM_FAULT_SIGBUS on an unknown / unsupported fault size.

Signature · 1 line
Jambhlekar Pushkar Arun