Re: [PATCH] mm: thp: fix a double unlock bug

From
Yang Shi <hidden>
Date
2021-06-01 17:30:35
Also in
kernel-janitors, lkml
Reply to
Dan Carpenter, 2021-06-01
On Tue, Jun 1, 2021 at 2:24 AM Dan Carpenter [off-list ref] wrote:
We're supposed to be holding the "vmf->ptl" spin_lock when we goto
out_map.  The lock is dropped after if finishes cleaning up.

Fixes: 9aff7b33c74a ("mm: thp: refactor NUMA fault handling")
Signed-off-by: Dan Carpenter <redacted>
Thanks for catching this. Acked-by: Yang Shi [off-list ref]
quoted hunk ↗ jump to hunk
---
 mm/huge_memory.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index e353bbc6cee3..caa0148f15bb 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1465,10 +1465,8 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf)

        pmd = pmd_modify(oldpmd, vma->vm_page_prot);
        page = vm_normal_page_pmd(vma, haddr, pmd);
-       if (!page) {
-               spin_unlock(vmf->ptl);
+       if (!page)
                goto out_map;
-       }

        /* See similar comment in do_numa_page for explanation */
        if (!was_writable)
--
2.30.2
  
Thread (4 messages) 4 messages, 3 authors, last reply 2021-06-01
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help