From: Joonsoo Kim <[email protected]>
This patchset clean-up the migration target allocation functions.
* Changes on v2
- add acked-by tags
- fix missing compound_head() call for the patch #3
- remove thisnode field on alloc_control and use __GFP_THISNODE directly
- fix missing __gfp_mask setup for the patch
"mm/hugetlb: do not modify user provided gfp_mask"
* Cover-letter
Contributions of this patchset are:
1. unify two hugetlb alloc functions. As a result, one is remained.
2. make one external hugetlb alloc function to internal one.
3. unify three functions for migration target allocation.
The patchset is based on next-20200526.
The patchset is available on:
https://github.com/JoonsooKim/linux/tree/cleanup-migration-target-allocation-v2.00-next-20200526
Thanks.
Joonsoo Kim (12):
mm/page_isolation: prefer the node of the source page
mm/migrate: move migration helper from .h to .c
mm/hugetlb: introduce alloc_control structure to simplify migration
target allocation APIs
mm/hugetlb: use provided ac->gfp_mask for allocation
mm/hugetlb: unify hugetlb migration callback function
mm/hugetlb: make hugetlb migration target allocation APIs CMA aware
mm/hugetlb: do not modify user provided gfp_mask
mm/migrate: change the interface of the migration target alloc/free
functions
mm/migrate: make standard migration target allocation functions
mm/gup: use standard migration target allocation function
mm/mempolicy: use standard migration target allocation function
mm/page_alloc: use standard migration target allocation function
directly
include/linux/hugetlb.h | 33 ++++++---------
include/linux/migrate.h | 44 +++++---------------
include/linux/page-isolation.h | 4 +-
mm/compaction.c | 15 ++++---
mm/gup.c | 60 +++++-----------------------
mm/hugetlb.c | 91 ++++++++++++++++++++----------------------
mm/internal.h | 12 +++++-
mm/memory-failure.c | 14 ++++---
mm/memory_hotplug.c | 10 +++--
mm/mempolicy.c | 38 ++++++------------
mm/migrate.c | 72 +++++++++++++++++++++++++--------
mm/page_alloc.c | 9 ++++-
mm/page_isolation.c | 5 ---
13 files changed, 191 insertions(+), 216 deletions(-)
--
2.7.4
On 5/27/20 8:44 AM, [email protected] wrote:
> From: Joonsoo Kim <[email protected]>
>
> This patchset clean-up the migration target allocation functions.
>
> * Changes on v2
> - add acked-by tags
> - fix missing compound_head() call for the patch #3
> - remove thisnode field on alloc_control and use __GFP_THISNODE directly
> - fix missing __gfp_mask setup for the patch
> "mm/hugetlb: do not modify user provided gfp_mask"
>
> * Cover-letter
>
> Contributions of this patchset are:
> 1. unify two hugetlb alloc functions. As a result, one is remained.
> 2. make one external hugetlb alloc function to internal one.
> 3. unify three functions for migration target allocation.
>
> The patchset is based on next-20200526.
> The patchset is available on:
I went through the series and I'd like to make some high-level suggestions
first, that should hopefully simplify the code a bit more and reduce churn:
- in the series, alloc_huge_page_nodemask() becomes the only caller of
alloc_migrate_huge_page(). So you can inline the code there, and it's one less
function out of many with similar name :)
- after that, alloc_huge_page_nodemask(ac) uses ac mostly just to extract
individual fields, and only pass it as a whole to dequeue_huge_page_nodemask().
The only other caller of dequeue...() is dequeue_huge_page_vma() who has to
construct ac from scratch. It might be probably simpler not to introduce struct
alloc_control into hugetlb code at all, and only keep it for
alloc_migrate_target(), at which point it can have a more specific name as
discussed and there's less churn
- I'd suggest not change signature of migrate_pages(), free_page_t and
new_page_t, keeping the opaque private field is fine as not all callbacks use
struct alloc_context pointer, and then e.g. compaction_alloc has to use the
private field etc. alloc_migration_target() can simply cast the private to
struct alloc_control *ac as the first thing
Thanks!
Vlastimil
> https://github.com/JoonsooKim/linux/tree/cleanup-migration-target-allocation-v2.00-next-20200526
>
> Thanks.
>
> Joonsoo Kim (12):
> mm/page_isolation: prefer the node of the source page
> mm/migrate: move migration helper from .h to .c
> mm/hugetlb: introduce alloc_control structure to simplify migration
> target allocation APIs
> mm/hugetlb: use provided ac->gfp_mask for allocation
> mm/hugetlb: unify hugetlb migration callback function
> mm/hugetlb: make hugetlb migration target allocation APIs CMA aware
> mm/hugetlb: do not modify user provided gfp_mask
> mm/migrate: change the interface of the migration target alloc/free
> functions
> mm/migrate: make standard migration target allocation functions
> mm/gup: use standard migration target allocation function
> mm/mempolicy: use standard migration target allocation function
> mm/page_alloc: use standard migration target allocation function
> directly
>
> include/linux/hugetlb.h | 33 ++++++---------
> include/linux/migrate.h | 44 +++++---------------
> include/linux/page-isolation.h | 4 +-
> mm/compaction.c | 15 ++++---
> mm/gup.c | 60 +++++-----------------------
> mm/hugetlb.c | 91 ++++++++++++++++++++----------------------
> mm/internal.h | 12 +++++-
> mm/memory-failure.c | 14 ++++---
> mm/memory_hotplug.c | 10 +++--
> mm/mempolicy.c | 38 ++++++------------
> mm/migrate.c | 72 +++++++++++++++++++++++++--------
> mm/page_alloc.c | 9 ++++-
> mm/page_isolation.c | 5 ---
> 13 files changed, 191 insertions(+), 216 deletions(-)
>
2020년 5월 29일 (금) 오전 4:25, Vlastimil Babka <[email protected]>님이 작성:
>
> On 5/27/20 8:44 AM, [email protected] wrote:
> > From: Joonsoo Kim <[email protected]>
> >
> > This patchset clean-up the migration target allocation functions.
> >
> > * Changes on v2
> > - add acked-by tags
> > - fix missing compound_head() call for the patch #3
> > - remove thisnode field on alloc_control and use __GFP_THISNODE directly
> > - fix missing __gfp_mask setup for the patch
> > "mm/hugetlb: do not modify user provided gfp_mask"
> >
> > * Cover-letter
> >
> > Contributions of this patchset are:
> > 1. unify two hugetlb alloc functions. As a result, one is remained.
> > 2. make one external hugetlb alloc function to internal one.
> > 3. unify three functions for migration target allocation.
> >
> > The patchset is based on next-20200526.
> > The patchset is available on:
>
> I went through the series and I'd like to make some high-level suggestions
> first, that should hopefully simplify the code a bit more and reduce churn:
Thanks for review!
I have not enough time today to check your suggestions.
I will check on next week and then reply again.
Thanks.
> - in the series, alloc_huge_page_nodemask() becomes the only caller of
> alloc_migrate_huge_page(). So you can inline the code there, and it's one less
> function out of many with similar name :)
>
> - after that, alloc_huge_page_nodemask(ac) uses ac mostly just to extract
> individual fields, and only pass it as a whole to dequeue_huge_page_nodemask().
> The only other caller of dequeue...() is dequeue_huge_page_vma() who has to
> construct ac from scratch. It might be probably simpler not to introduce struct
> alloc_control into hugetlb code at all, and only keep it for
> alloc_migrate_target(), at which point it can have a more specific name as
> discussed and there's less churn
>
> - I'd suggest not change signature of migrate_pages(), free_page_t and
> new_page_t, keeping the opaque private field is fine as not all callbacks use
> struct alloc_context pointer, and then e.g. compaction_alloc has to use the
> private field etc. alloc_migration_target() can simply cast the private to
> struct alloc_control *ac as the first thing
2020년 5월 29일 (금) 오후 3:50, Joonsoo Kim <[email protected]>님이 작성:
>
> 2020년 5월 29일 (금) 오전 4:25, Vlastimil Babka <[email protected]>님이 작성:
> >
> > On 5/27/20 8:44 AM, [email protected] wrote:
> > > From: Joonsoo Kim <[email protected]>
> > >
> > > This patchset clean-up the migration target allocation functions.
> > >
> > > * Changes on v2
> > > - add acked-by tags
> > > - fix missing compound_head() call for the patch #3
> > > - remove thisnode field on alloc_control and use __GFP_THISNODE directly
> > > - fix missing __gfp_mask setup for the patch
> > > "mm/hugetlb: do not modify user provided gfp_mask"
> > >
> > > * Cover-letter
> > >
> > > Contributions of this patchset are:
> > > 1. unify two hugetlb alloc functions. As a result, one is remained.
> > > 2. make one external hugetlb alloc function to internal one.
> > > 3. unify three functions for migration target allocation.
> > >
> > > The patchset is based on next-20200526.
> > > The patchset is available on:
> >
> > I went through the series and I'd like to make some high-level suggestions
> > first, that should hopefully simplify the code a bit more and reduce churn:
>
> Thanks for review!
> I have not enough time today to check your suggestions.
> I will check on next week and then reply again.
>
> Thanks.
>
> > - in the series, alloc_huge_page_nodemask() becomes the only caller of
> > alloc_migrate_huge_page(). So you can inline the code there, and it's one less
> > function out of many with similar name :)
> >
> > - after that, alloc_huge_page_nodemask(ac) uses ac mostly just to extract
> > individual fields, and only pass it as a whole to dequeue_huge_page_nodemask().
> > The only other caller of dequeue...() is dequeue_huge_page_vma() who has to
> > construct ac from scratch. It might be probably simpler not to introduce struct
> > alloc_control into hugetlb code at all, and only keep it for
> > alloc_migrate_target(), at which point it can have a more specific name as
> > discussed and there's less churn
> >
> > - I'd suggest not change signature of migrate_pages(), free_page_t and
> > new_page_t, keeping the opaque private field is fine as not all callbacks use
> > struct alloc_context pointer, and then e.g. compaction_alloc has to use the
> > private field etc. alloc_migration_target() can simply cast the private to
> > struct alloc_control *ac as the first thing
Looks like all your suggestions are reasonable. I will try them and make v3.
Thanks.