+ mm-remove-duplicated-include-in-vma_internalh-fix.patch added to mm-unstable branch

+ mm-remove-duplicated-include-in-vma_internalh-fix.patch added to mm-unstable branch

[Andrew Morton]

The patch titled
     Subject: mm: fixup vma.h for nommu
has been added to the -mm mm-unstable branch.  Its filename is
     mm-remove-duplicated-include-in-vma_internalh-fix.patch

This patch will shortly appear at
     https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-remove-duplicated-include-in-vma_internalh-fix.patch

This patch will later appear in the mm-unstable branch at
    git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***

The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days

------------------------------------------------------
From: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Subject: mm: fixup vma.h for nommu
Date: Sun, 25 Aug 2024 12:29:47 +0100

Some series of includes result in vma.h being imported by nommu under
certain circumstances, which references FIRST_USER_ADDRESS and
USER_PGTABLES_CEILING, neither of which are necessarily defined in a nommu
scenario.

Work around this by wrapping the inline function which references these
(init_vma_munmap()) in an #ifdef CONFIG_MMU.

Link: https://lkml.kernel.org/r/7d0ea994-f750-49c5-b392-ae7117369cf3@lucifer.local
Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Reported-by: SeongJae Park <sj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/vma.h |    2 ++
 1 file changed, 2 insertions(+)

--- a/mm/vma.h~mm-remove-duplicated-include-in-vma_internalh-fix
+++ a/mm/vma.h
@@ -225,6 +225,7 @@ static inline int vma_iter_store_gfp(str
 }
 
 
+#ifdef CONFIG_MMU
 /*
  * These three helpers classifies VMAs for virtual memory accounting.
  */
@@ -255,6 +256,7 @@ static inline bool is_data_mapping(vm_fl
 {
 	return (flags & (VM_WRITE | VM_SHARED | VM_STACK)) == VM_WRITE;
 }
+#endif
 
 
 static inline void vma_iter_config(struct vma_iterator *vmi,
_

Patches currently in -mm which might be from lorenzo.stoakes@oracle.com are

userfaultfd-move-core-vma-manipulation-logic-to-mm-userfaultfdc.patch
userfaultfd-move-core-vma-manipulation-logic-to-mm-userfaultfdc-fix.patch
mm-move-vma_modify-and-helpers-to-internal-header.patch
mm-move-vma_shrink-vma_expand-to-internal-header.patch
mm-move-internal-core-vma-manipulation-functions-to-own-file.patch
maintainers-add-entry-for-new-vma-files.patch
tools-separate-out-shared-radix-tree-components.patch
tools-add-skeleton-code-for-userland-testing-of-vma-logic.patch
mm-remove-duplicated-include-in-vma_internalh-fix.patch
mm-vma-track-start-and-end-for-munmap-in-vma_munmap_struct-fix.patch
tools-improve-vma-test-makefile.patch
tools-add-vma-merge-tests.patch
mm-introduce-vma_merge_struct-and-abstract-vma_mergevma_modify.patch
mm-remove-duplicated-open-coded-vma-policy-check.patch
mm-abstract-vma_expand-to-use-vma_merge_struct.patch
mm-avoid-using-vma_merge-for-new-vmas.patch
mm-avoid-using-vma_merge-for-new-vmas-fix.patch
mm-make-vma_prepare-and-friends-static-and-internal-to-vmac.patch
mm-introduce-commit_merge-abstracting-final-commit-of-merge.patch
mm-refactor-vma_merge-into-modify-only-vma_merge_existing_range.patch
mm-rework-vm_ops-close-handling-on-vma-merge.patch

Re: + mm-remove-duplicated-include-in-vma_internalh-fix.patch added to mm-unstable branch

[Lorenzo Stoakes]

On Tue, Aug 27, 2024 at 07:56:11PM GMT, Andrew Morton wrote:
>
> The patch titled
>      Subject: mm: fixup vma.h for nommu
> has been added to the -mm mm-unstable branch.  Its filename is
>      mm-remove-duplicated-include-in-vma_internalh-fix.patch
>
> This patch will shortly appear at
>      https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-remove-duplicated-include-in-vma_internalh-fix.patch
>
> This patch will later appear in the mm-unstable branch at
>     git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
>
> Before you just go and hit "reply", please:
>    a) Consider who else should be cc'ed
>    b) Prefer to cc a suitable mailing list as well
>    c) Ideally: find the original patch on the mailing list and do a
>       reply-to-all to that, adding suitable additional cc's
>
> *** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
>
> The -mm tree is included into linux-next via the mm-everything
> branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
> and is updated there every 2-3 working days
>
> ------------------------------------------------------
> From: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
> Subject: mm: fixup vma.h for nommu
> Date: Sun, 25 Aug 2024 12:29:47 +0100
>
> Some series of includes result in vma.h being imported by nommu under
> certain circumstances, which references FIRST_USER_ADDRESS and
> USER_PGTABLES_CEILING, neither of which are necessarily defined in a nommu
> scenario.
>
> Work around this by wrapping the inline function which references these
> (init_vma_munmap()) in an #ifdef CONFIG_MMU.
>
> Link: https://lkml.kernel.org/r/7d0ea994-f750-49c5-b392-ae7117369cf3@lucifer.local
> Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
> Reported-by: SeongJae Park <sj@kernel.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
>
>  mm/vma.h |    2 ++
>  1 file changed, 2 insertions(+)
>
> --- a/mm/vma.h~mm-remove-duplicated-include-in-vma_internalh-fix
> +++ a/mm/vma.h
> @@ -225,6 +225,7 @@ static inline int vma_iter_store_gfp(str
>  }
>
>
> +#ifdef CONFIG_MMU
>  /*
>   * These three helpers classifies VMAs for virtual memory accounting.
>   */
> @@ -255,6 +256,7 @@ static inline bool is_data_mapping(vm_fl
>  {
>  	return (flags & (VM_WRITE | VM_SHARED | VM_STACK)) == VM_WRITE;
>  }
> +#endif
>

Something's gone horribly wrong here! This ifdef is not meant to be here
but rather around init_vma_munmap() as shown in fix patch in [0].

I'm not sure how the patch got mangled like this.

Could we replace this bogus patch with the correct one? Thanks!


[0]: https://lore.kernel.org/all/7d0ea994-f750-49c5-b392-ae7117369cf3@lucifer.local/


>
>  static inline void vma_iter_config(struct vma_iterator *vmi,
> _
>
> Patches currently in -mm which might be from lorenzo.stoakes@oracle.com are
>
> userfaultfd-move-core-vma-manipulation-logic-to-mm-userfaultfdc.patch
> userfaultfd-move-core-vma-manipulation-logic-to-mm-userfaultfdc-fix.patch
> mm-move-vma_modify-and-helpers-to-internal-header.patch
> mm-move-vma_shrink-vma_expand-to-internal-header.patch
> mm-move-internal-core-vma-manipulation-functions-to-own-file.patch
> maintainers-add-entry-for-new-vma-files.patch
> tools-separate-out-shared-radix-tree-components.patch
> tools-add-skeleton-code-for-userland-testing-of-vma-logic.patch
> mm-remove-duplicated-include-in-vma_internalh-fix.patch
> mm-vma-track-start-and-end-for-munmap-in-vma_munmap_struct-fix.patch
> tools-improve-vma-test-makefile.patch
> tools-add-vma-merge-tests.patch
> mm-introduce-vma_merge_struct-and-abstract-vma_mergevma_modify.patch
> mm-remove-duplicated-open-coded-vma-policy-check.patch
> mm-abstract-vma_expand-to-use-vma_merge_struct.patch
> mm-avoid-using-vma_merge-for-new-vmas.patch
> mm-avoid-using-vma_merge-for-new-vmas-fix.patch
> mm-make-vma_prepare-and-friends-static-and-internal-to-vmac.patch
> mm-introduce-commit_merge-abstracting-final-commit-of-merge.patch
> mm-refactor-vma_merge-into-modify-only-vma_merge_existing_range.patch
> mm-rework-vm_ops-close-handling-on-vma-merge.patch
>

Re: + mm-remove-duplicated-include-in-vma_internalh-fix.patch added to mm-unstable branch

[Lorenzo Stoakes]

On Tue, Aug 27, 2024 at 07:56:11PM GMT, Andrew Morton wrote:
>
> The patch titled
>      Subject: mm: fixup vma.h for nommu
> has been added to the -mm mm-unstable branch.  Its filename is
>      mm-remove-duplicated-include-in-vma_internalh-fix.patch
>
> This patch will shortly appear at
>      https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-remove-duplicated-include-in-vma_internalh-fix.patch
>
> This patch will later appear in the mm-unstable branch at
>     git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
>
> Before you just go and hit "reply", please:
>    a) Consider who else should be cc'ed
>    b) Prefer to cc a suitable mailing list as well
>    c) Ideally: find the original patch on the mailing list and do a
>       reply-to-all to that, adding suitable additional cc's
>
> *** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
>
> The -mm tree is included into linux-next via the mm-everything
> branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
> and is updated there every 2-3 working days
>
> ------------------------------------------------------
> From: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
> Subject: mm: fixup vma.h for nommu
> Date: Sun, 25 Aug 2024 12:29:47 +0100
>
> Some series of includes result in vma.h being imported by nommu under
> certain circumstances, which references FIRST_USER_ADDRESS and
> USER_PGTABLES_CEILING, neither of which are necessarily defined in a nommu
> scenario.
>
> Work around this by wrapping the inline function which references these
> (init_vma_munmap()) in an #ifdef CONFIG_MMU.
>
> Link: https://lkml.kernel.org/r/7d0ea994-f750-49c5-b392-ae7117369cf3@lucifer.local
> Signed-off-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
> Reported-by: SeongJae Park <sj@kernel.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> ---
>
>  mm/vma.h |    2 ++
>  1 file changed, 2 insertions(+)
>
> --- a/mm/vma.h~mm-remove-duplicated-include-in-vma_internalh-fix
> +++ a/mm/vma.h
> @@ -225,6 +225,7 @@ static inline int vma_iter_store_gfp(str
>  }
>
>
> +#ifdef CONFIG_MMU
>  /*
>   * These three helpers classifies VMAs for virtual memory accounting.
>   */
> @@ -255,6 +256,7 @@ static inline bool is_data_mapping(vm_fl
>  {
>  	return (flags & (VM_WRITE | VM_SHARED | VM_STACK)) == VM_WRITE;
>  }
> +#endif
>

Something's gone horribly wrong here! This ifdef is not meant to be here
but rather around init_vma_munmap() as shown in fix patch in [0].

I'm not sure how the patch got mangled like this.

Could we replace this bogus patch with the correct one? Thanks!


[0]: https://lore.kernel.org/all/7d0ea994-f750-49c5-b392-ae7117369cf3@lucifer.local/


>
>  static inline void vma_iter_config(struct vma_iterator *vmi,
> _
>
> Patches currently in -mm which might be from lorenzo.stoakes@oracle.com are
>
> userfaultfd-move-core-vma-manipulation-logic-to-mm-userfaultfdc.patch
> userfaultfd-move-core-vma-manipulation-logic-to-mm-userfaultfdc-fix.patch
> mm-move-vma_modify-and-helpers-to-internal-header.patch
> mm-move-vma_shrink-vma_expand-to-internal-header.patch
> mm-move-internal-core-vma-manipulation-functions-to-own-file.patch
> maintainers-add-entry-for-new-vma-files.patch
> tools-separate-out-shared-radix-tree-components.patch
> tools-add-skeleton-code-for-userland-testing-of-vma-logic.patch
> mm-remove-duplicated-include-in-vma_internalh-fix.patch
> mm-vma-track-start-and-end-for-munmap-in-vma_munmap_struct-fix.patch
> tools-improve-vma-test-makefile.patch
> tools-add-vma-merge-tests.patch
> mm-introduce-vma_merge_struct-and-abstract-vma_mergevma_modify.patch
> mm-remove-duplicated-open-coded-vma-policy-check.patch
> mm-abstract-vma_expand-to-use-vma_merge_struct.patch
> mm-avoid-using-vma_merge-for-new-vmas.patch
> mm-avoid-using-vma_merge-for-new-vmas-fix.patch
> mm-make-vma_prepare-and-friends-static-and-internal-to-vmac.patch
> mm-introduce-commit_merge-abstracting-final-commit-of-merge.patch
> mm-refactor-vma_merge-into-modify-only-vma_merge_existing_range.patch
> mm-rework-vm_ops-close-handling-on-vma-merge.patch
>

Re: + mm-remove-duplicated-include-in-vma_internalh-fix.patch added to mm-unstable branch

[Andrew Morton]

On Wed, 28 Aug 2024 09:33:15 +0100 Lorenzo Stoakes <lorenzo.stoakes@oracle.com> wrote:

> > +#ifdef CONFIG_MMU
> >  /*
> >   * These three helpers classifies VMAs for virtual memory accounting.
> >   */
> > @@ -255,6 +256,7 @@ static inline bool is_data_mapping(vm_fl
> >  {
> >  	return (flags & (VM_WRITE | VM_SHARED | VM_STACK)) == VM_WRITE;
> >  }
> > +#endif
> >
> 
> Something's gone horribly wrong here! This ifdef is not meant to be here
> but rather around init_vma_munmap() as shown in fix patch in [0].
> 
> I'm not sure how the patch got mangled like this.
> 
> Could we replace this bogus patch with the correct one? Thanks!
> 
> 
> [0]: https://lore.kernel.org/all/7d0ea994-f750-49c5-b392-ae7117369cf3@lucifer.local/

afaict this is a fix against "mm/vma: expand mmap_region() munmap
call", so applying it against "mm: remove duplicated include in
vma_internal.h" made everything go pear-shaped.

Re: + mm-remove-duplicated-include-in-vma_internalh-fix.patch added to mm-unstable branch

[Lorenzo Stoakes]

On Wed, Aug 28, 2024 at 02:27:00AM GMT, Andrew Morton wrote:
> On Wed, 28 Aug 2024 09:33:15 +0100 Lorenzo Stoakes <lorenzo.stoakes@oracle.com> wrote:
>
> > > +#ifdef CONFIG_MMU
> > >  /*
> > >   * These three helpers classifies VMAs for virtual memory accounting.
> > >   */
> > > @@ -255,6 +256,7 @@ static inline bool is_data_mapping(vm_fl
> > >  {
> > >  	return (flags & (VM_WRITE | VM_SHARED | VM_STACK)) == VM_WRITE;
> > >  }
> > > +#endif
> > >
> >
> > Something's gone horribly wrong here! This ifdef is not meant to be here
> > but rather around init_vma_munmap() as shown in fix patch in [0].
> >
> > I'm not sure how the patch got mangled like this.
> >
> > Could we replace this bogus patch with the correct one? Thanks!
> >
> >
> > [0]: https://lore.kernel.org/all/7d0ea994-f750-49c5-b392-ae7117369cf3@lucifer.local/
>
> afaict this is a fix against "mm/vma: expand mmap_region() munmap
> call", so applying it against "mm: remove duplicated include in
> vma_internal.h" made everything go pear-shaped.
>

Yeah sorry, this is my bad for not putting the fix next to the appropriate
patch and just linking that from the report. Have done that for other such
cases and will do that going forward to make life easier :)