Message ID | 20210331163816.11517-1-rppt@kernel.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | mm/hugeltb: fix renaming of PF_MEMALLOC_NOCMA to PF_MEMALLOC_PIN | expand |
On Wed, Mar 31, 2021 at 12:38 PM Mike Rapoport <rppt@kernel.org> wrote: > > From: Mike Rapoport <rppt@linux.ibm.com> > > The renaming of PF_MEMALLOC_NOCMA to PF_MEMALLOC_PIN missed one occurrence > in mm/hugetlb.c which causes build error: > > CC mm/hugetlb.o > mm/hugetlb.c: In function ‘dequeue_huge_page_node_exact’: > mm/hugetlb.c:1081:33: error: ‘PF_MEMALLOC_NOCMA’ undeclared (first use in this function); did you mean ‘PF_MEMALLOC_NOFS’? > bool pin = !!(current->flags & PF_MEMALLOC_NOCMA); > ^~~~~~~~~~~~~~~~~ > PF_MEMALLOC_NOFS > mm/hugetlb.c:1081:33: note: each undeclared identifier is reported only once for each function it appears in > scripts/Makefile.build:273: recipe for target 'mm/hugetlb.o' failed > make[2]: *** [mm/hugetlb.o] Error 1 > > Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> > --- > mm/hugetlb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index a5236c2f7bb2..c22111f3da20 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -1078,7 +1078,7 @@ static void enqueue_huge_page(struct hstate *h, struct page *page) > static struct page *dequeue_huge_page_node_exact(struct hstate *h, int nid) > { > struct page *page; > - bool pin = !!(current->flags & PF_MEMALLOC_NOCMA); > + bool pin = !!(current->flags & PF_MEMALLOC_PIN); Thank you Mike! Andrew, since "mm cma: rename PF_MEMALLOC_NOCMA to PF_MEMALLOC_PIN" is not yet in the mainline, should I send a new version of this patch so we won't have bisecting problems in the future? Thank you, Pasha
On Thu, 1 Apr 2021 10:26:36 -0400 Pavel Tatashin <pasha.tatashin@soleen.com> wrote: > On Wed, Mar 31, 2021 at 12:38 PM Mike Rapoport <rppt@kernel.org> wrote: > > > > From: Mike Rapoport <rppt@linux.ibm.com> > > > > The renaming of PF_MEMALLOC_NOCMA to PF_MEMALLOC_PIN missed one occurrence > > in mm/hugetlb.c which causes build error: > > > > CC mm/hugetlb.o > > mm/hugetlb.c: In function ‘dequeue_huge_page_node_exact’: > > mm/hugetlb.c:1081:33: error: ‘PF_MEMALLOC_NOCMA’ undeclared (first use in this function); did you mean ‘PF_MEMALLOC_NOFS’? > > bool pin = !!(current->flags & PF_MEMALLOC_NOCMA); > > ^~~~~~~~~~~~~~~~~ > > PF_MEMALLOC_NOFS > > mm/hugetlb.c:1081:33: note: each undeclared identifier is reported only once for each function it appears in > > scripts/Makefile.build:273: recipe for target 'mm/hugetlb.o' failed > > make[2]: *** [mm/hugetlb.o] Error 1 > > > > Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> > > --- > > mm/hugetlb.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > > index a5236c2f7bb2..c22111f3da20 100644 > > --- a/mm/hugetlb.c > > +++ b/mm/hugetlb.c > > @@ -1078,7 +1078,7 @@ static void enqueue_huge_page(struct hstate *h, struct page *page) > > static struct page *dequeue_huge_page_node_exact(struct hstate *h, int nid) > > { > > struct page *page; > > - bool pin = !!(current->flags & PF_MEMALLOC_NOCMA); > > + bool pin = !!(current->flags & PF_MEMALLOC_PIN); > > Thank you Mike! > > Andrew, since "mm cma: rename PF_MEMALLOC_NOCMA to PF_MEMALLOC_PIN" is > not yet in the mainline, should I send a new version of this patch so > we won't have bisecting problems in the future? I've already added Mike's fix, as mm-cma-rename-pf_memalloc_nocma-to-pf_memalloc_pin-fix.patch. It shall fold it into mm-cma-rename-pf_memalloc_nocma-to-pf_memalloc_pin.patch prior to upstreaming, so no bisection issue.
> > Andrew, since "mm cma: rename PF_MEMALLOC_NOCMA to PF_MEMALLOC_PIN" is > > not yet in the mainline, should I send a new version of this patch so > > we won't have bisecting problems in the future? > > I've already added Mike's fix, as > mm-cma-rename-pf_memalloc_nocma-to-pf_memalloc_pin-fix.patch. It shall > fold it into mm-cma-rename-pf_memalloc_nocma-to-pf_memalloc_pin.patch > prior to upstreaming, so no bisection issue. Great, thank you! Pasha
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index a5236c2f7bb2..c22111f3da20 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1078,7 +1078,7 @@ static void enqueue_huge_page(struct hstate *h, struct page *page) static struct page *dequeue_huge_page_node_exact(struct hstate *h, int nid) { struct page *page; - bool pin = !!(current->flags & PF_MEMALLOC_NOCMA); + bool pin = !!(current->flags & PF_MEMALLOC_PIN); lockdep_assert_held(&hugetlb_lock); list_for_each_entry(page, &h->hugepage_freelists[nid], lru) {