Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 6 Dec 2022 21:40:18 -0800
From:   Saurabh Singh Sengar <ssengar@linux.microsoft.com>
To:     Yu Zhao <yuzhao@google.com>
Cc:     ssengar@microsoft.com, akpm@linux-foundation.org, jack@suse.cz,
        linux-mm@kvack.org, linux-kernel@vger.kernel.org,
        jostarks@microsoft.com, Matthew Wilcox <willy@infradead.org>,
        Dan Williams <dan.j.williams@intel.com>
Subject: Re: [PATCH] mm/gup: fix gup_pud_range() for dax
Message-ID: <20221207054018.GB23765@linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net>
References: <1666289686-22798-1-git-send-email-ssengar@linux.microsoft.com>
 <CAOUHufbkcdyg8RAEa08DvKE=+bsxjuReiP4iscTV99sZ1oBQ2g@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAOUHufbkcdyg8RAEa08DvKE=+bsxjuReiP4iscTV99sZ1oBQ2g@mail.gmail.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
Precedence: bulk

On Thu, Oct 20, 2022 at 04:18:37PM -0600, Yu Zhao wrote:
> On Thu, Oct 20, 2022 at 12:14 PM Saurabh Sengar
> <ssengar@linux.microsoft.com> wrote:
> >
> > From: John Starks <jostarks@microsoft.com>
> >
> > For dax pud, pud_huge() returns true on x86. So the function works as long
> > as hugetlb is configured. However, dax doesn't depend on hugetlb.
> > Commit 414fd080d125 ("mm/gup: fix gup_pmd_range() for dax") fixed
> > devmap-backed huge PMDs, but missed devmap-backed huge PUDs. Fix this as
> > well.
> >
> > Fixes: 414fd080d125 ("mm/gup: fix gup_pmd_range() for dax")
> > Signed-off-by: John Starks <jostarks@microsoft.com>
> > Signed-off-by: Saurabh Sengar <ssengar@linux.microsoft.com>
> > ---
> >  mm/gup.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/mm/gup.c b/mm/gup.c
> > index 05068d3d2557..9e07aa54a4cd 100644
> > --- a/mm/gup.c
> > +++ b/mm/gup.c
> > @@ -2687,7 +2687,7 @@ static int gup_pud_range(p4d_t *p4dp, p4d_t p4d, unsigned long addr, unsigned lo
> >                 next = pud_addr_end(addr, end);
> >                 if (unlikely(!pud_present(pud)))
> >                         return 0;
> > -               if (unlikely(pud_huge(pud))) {
> > +               if (unlikely(pud_huge(pud) || pud_devmap(pud))) {
> 
> Perhaps s/pud_huge/pud_leaf/ ?
Looks good to me but I am not sure the wider impact of this, I will let maintainers
comment on it. Meanwhile I will send a V2 with more description of panic observed.
> 
> >                         if (!gup_huge_pud(pud, pudp, addr, next, flags,
> >                                           pages, nr))
> >                                 return 0;
> > --
> > 2.25.1
> >