Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <YLX8uYN01JmfLnlK@mwanda>
In-Reply-To: <YLX8uYN01JmfLnlK@mwanda>
From:   Yang Shi <shy828301@gmail.com>
Date:   Tue, 1 Jun 2021 10:30:17 -0700
Message-ID: <CAHbLzkpkxJHVaihrPWV04ejgbaJU4xiN7xTvfHcn33cX6JcgYA@mail.gmail.com>
Subject: Re: [PATCH] mm: thp: fix a double unlock bug
To:     Dan Carpenter <dan.carpenter@oracle.com>
Cc:     Andrew Morton <akpm@linux-foundation.org>,
        Mel Gorman <mgorman@suse.de>, Linux MM <linux-mm@kvack.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        kernel-janitors@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Tue, Jun 1, 2021 at 2:24 AM Dan Carpenter <dan.carpenter@oracle.com> 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 <dan.carpenter@oracle.com>

Thanks for catching this. Acked-by: Yang Shi <shy828301@gmail.com>

> ---
>  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
>