* [PATCH v1] mm/memory_hotplug: Remove move_pfn_range()
@ 2019-07-24 14:23 David Hildenbrand
2019-07-24 15:45 ` Michal Hocko
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: David Hildenbrand @ 2019-07-24 14:23 UTC (permalink / raw)
To: linux-kernel
Cc: linux-mm, David Hildenbrand, Andrew Morton, Oscar Salvador,
Michal Hocko, Pavel Tatashin, Dan Williams
Let's remove this indirection. We need the zone in the caller either
way, so let's just detect it there. Add some documentation for
move_pfn_range_to_zone() instead.
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Michal Hocko <mhocko@suse.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
mm/memory_hotplug.c | 23 +++++++----------------
1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index efa5283be36c..e7c3b219a305 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -715,7 +715,11 @@ static void __meminit resize_pgdat_range(struct pglist_data *pgdat, unsigned lon
pgdat->node_spanned_pages = max(start_pfn + nr_pages, old_end_pfn) - pgdat->node_start_pfn;
}
-
+/*
+ * Associate the pfn range with the given zone, initializing the memmaps
+ * and resizing the pgdat/zone data to span the added pages. After this
+ * call, all affected pages are PG_reserved.
+ */
void __ref move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn,
unsigned long nr_pages, struct vmem_altmap *altmap)
{
@@ -804,20 +808,6 @@ struct zone * zone_for_pfn_range(int online_type, int nid, unsigned start_pfn,
return default_zone_for_pfn(nid, start_pfn, nr_pages);
}
-/*
- * Associates the given pfn range with the given node and the zone appropriate
- * for the given online type.
- */
-static struct zone * __meminit move_pfn_range(int online_type, int nid,
- unsigned long start_pfn, unsigned long nr_pages)
-{
- struct zone *zone;
-
- zone = zone_for_pfn_range(online_type, nid, start_pfn, nr_pages);
- move_pfn_range_to_zone(zone, start_pfn, nr_pages, NULL);
- return zone;
-}
-
int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_type)
{
unsigned long flags;
@@ -840,7 +830,8 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ
put_device(&mem->dev);
/* associate pfn range with the zone */
- zone = move_pfn_range(online_type, nid, pfn, nr_pages);
+ zone = zone_for_pfn_range(online_type, nid, pfn, nr_pages);
+ move_pfn_range_to_zone(zone, pfn, nr_pages, NULL);
arg.start_pfn = pfn;
arg.nr_pages = nr_pages;
--
2.21.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v1] mm/memory_hotplug: Remove move_pfn_range()
2019-07-24 14:23 [PATCH v1] mm/memory_hotplug: Remove move_pfn_range() David Hildenbrand
@ 2019-07-24 15:45 ` Michal Hocko
2019-07-24 15:49 ` David Hildenbrand
2019-07-26 11:09 ` Oscar Salvador
2 siblings, 0 replies; 4+ messages in thread
From: Michal Hocko @ 2019-07-24 15:45 UTC (permalink / raw)
To: David Hildenbrand
Cc: linux-kernel, linux-mm, Andrew Morton, Oscar Salvador,
Pavel Tatashin, Dan Williams
On Wed 24-07-19 16:23:24, David Hildenbrand wrote:
> Let's remove this indirection. We need the zone in the caller either
> way, so let's just detect it there. Add some documentation for
> move_pfn_range_to_zone() instead.
>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Oscar Salvador <osalvador@suse.de>
> Cc: Michal Hocko <mhocko@suse.com>
> Cc: David Hildenbrand <david@redhat.com>
> Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
> Cc: Dan Williams <dan.j.williams@intel.com>
> Signed-off-by: David Hildenbrand <david@redhat.com>
Acked-by: Michal Hocko <mhocko@suse.com>
> ---
> mm/memory_hotplug.c | 23 +++++++----------------
> 1 file changed, 7 insertions(+), 16 deletions(-)
>
> diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
> index efa5283be36c..e7c3b219a305 100644
> --- a/mm/memory_hotplug.c
> +++ b/mm/memory_hotplug.c
> @@ -715,7 +715,11 @@ static void __meminit resize_pgdat_range(struct pglist_data *pgdat, unsigned lon
>
> pgdat->node_spanned_pages = max(start_pfn + nr_pages, old_end_pfn) - pgdat->node_start_pfn;
> }
> -
> +/*
> + * Associate the pfn range with the given zone, initializing the memmaps
> + * and resizing the pgdat/zone data to span the added pages. After this
> + * call, all affected pages are PG_reserved.
> + */
> void __ref move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn,
> unsigned long nr_pages, struct vmem_altmap *altmap)
> {
> @@ -804,20 +808,6 @@ struct zone * zone_for_pfn_range(int online_type, int nid, unsigned start_pfn,
> return default_zone_for_pfn(nid, start_pfn, nr_pages);
> }
>
> -/*
> - * Associates the given pfn range with the given node and the zone appropriate
> - * for the given online type.
> - */
> -static struct zone * __meminit move_pfn_range(int online_type, int nid,
> - unsigned long start_pfn, unsigned long nr_pages)
> -{
> - struct zone *zone;
> -
> - zone = zone_for_pfn_range(online_type, nid, start_pfn, nr_pages);
> - move_pfn_range_to_zone(zone, start_pfn, nr_pages, NULL);
> - return zone;
> -}
> -
> int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_type)
> {
> unsigned long flags;
> @@ -840,7 +830,8 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ
> put_device(&mem->dev);
>
> /* associate pfn range with the zone */
> - zone = move_pfn_range(online_type, nid, pfn, nr_pages);
> + zone = zone_for_pfn_range(online_type, nid, pfn, nr_pages);
> + move_pfn_range_to_zone(zone, pfn, nr_pages, NULL);
>
> arg.start_pfn = pfn;
> arg.nr_pages = nr_pages;
> --
> 2.21.0
--
Michal Hocko
SUSE Labs
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1] mm/memory_hotplug: Remove move_pfn_range()
2019-07-24 14:23 [PATCH v1] mm/memory_hotplug: Remove move_pfn_range() David Hildenbrand
2019-07-24 15:45 ` Michal Hocko
@ 2019-07-24 15:49 ` David Hildenbrand
2019-07-26 11:09 ` Oscar Salvador
2 siblings, 0 replies; 4+ messages in thread
From: David Hildenbrand @ 2019-07-24 15:49 UTC (permalink / raw)
To: linux-kernel
Cc: linux-mm, Andrew Morton, Oscar Salvador, Michal Hocko,
Pavel Tatashin, Dan Williams
On 24.07.19 16:23, David Hildenbrand wrote:
> Let's remove this indirection. We need the zone in the caller either
> way, so let's just detect it there. Add some documentation for
> move_pfn_range_to_zone() instead.
>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Oscar Salvador <osalvador@suse.de>
> Cc: Michal Hocko <mhocko@suse.com>
> Cc: David Hildenbrand <david@redhat.com>
> Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
> Cc: Dan Williams <dan.j.williams@intel.com>
> Signed-off-by: David Hildenbrand <david@redhat.com>
> ---
> mm/memory_hotplug.c | 23 +++++++----------------
> 1 file changed, 7 insertions(+), 16 deletions(-)
>
> diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
> index efa5283be36c..e7c3b219a305 100644
> --- a/mm/memory_hotplug.c
> +++ b/mm/memory_hotplug.c
> @@ -715,7 +715,11 @@ static void __meminit resize_pgdat_range(struct pglist_data *pgdat, unsigned lon
>
> pgdat->node_spanned_pages = max(start_pfn + nr_pages, old_end_pfn) - pgdat->node_start_pfn;
> }
> -
^ whoops, deleted this empty line by mistake - it should stay of course.
Can resend.
> +/*
> + * Associate the pfn range with the given zone, initializing the memmaps
> + * and resizing the pgdat/zone data to span the added pages. After this
> + * call, all affected pages are PG_reserved.
> + */
> void __ref move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn,
> unsigned long nr_pages, struct vmem_altmap *altmap)
> {
> @@ -804,20 +808,6 @@ struct zone * zone_for_pfn_range(int online_type, int nid, unsigned start_pfn,
> return default_zone_for_pfn(nid, start_pfn, nr_pages);
> }
>
> -/*
> - * Associates the given pfn range with the given node and the zone appropriate
> - * for the given online type.
> - */
> -static struct zone * __meminit move_pfn_range(int online_type, int nid,
> - unsigned long start_pfn, unsigned long nr_pages)
> -{
> - struct zone *zone;
> -
> - zone = zone_for_pfn_range(online_type, nid, start_pfn, nr_pages);
> - move_pfn_range_to_zone(zone, start_pfn, nr_pages, NULL);
> - return zone;
> -}
> -
> int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_type)
> {
> unsigned long flags;
> @@ -840,7 +830,8 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ
> put_device(&mem->dev);
>
> /* associate pfn range with the zone */
> - zone = move_pfn_range(online_type, nid, pfn, nr_pages);
> + zone = zone_for_pfn_range(online_type, nid, pfn, nr_pages);
> + move_pfn_range_to_zone(zone, pfn, nr_pages, NULL);
>
> arg.start_pfn = pfn;
> arg.nr_pages = nr_pages;
>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1] mm/memory_hotplug: Remove move_pfn_range()
2019-07-24 14:23 [PATCH v1] mm/memory_hotplug: Remove move_pfn_range() David Hildenbrand
2019-07-24 15:45 ` Michal Hocko
2019-07-24 15:49 ` David Hildenbrand
@ 2019-07-26 11:09 ` Oscar Salvador
2 siblings, 0 replies; 4+ messages in thread
From: Oscar Salvador @ 2019-07-26 11:09 UTC (permalink / raw)
To: David Hildenbrand
Cc: linux-kernel, linux-mm, Andrew Morton, Michal Hocko,
Pavel Tatashin, Dan Williams
On Wed, Jul 24, 2019 at 04:23:24PM +0200, David Hildenbrand wrote:
> Let's remove this indirection. We need the zone in the caller either
> way, so let's just detect it there. Add some documentation for
> move_pfn_range_to_zone() instead.
>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Oscar Salvador <osalvador@suse.de>
> Cc: Michal Hocko <mhocko@suse.com>
> Cc: David Hildenbrand <david@redhat.com>
> Cc: Pavel Tatashin <pasha.tatashin@soleen.com>
> Cc: Dan Williams <dan.j.williams@intel.com>
> Signed-off-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Oscar Salvador <osalvador@suse.de>
> ---
> mm/memory_hotplug.c | 23 +++++++----------------
> 1 file changed, 7 insertions(+), 16 deletions(-)
>
> diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
> index efa5283be36c..e7c3b219a305 100644
> --- a/mm/memory_hotplug.c
> +++ b/mm/memory_hotplug.c
> @@ -715,7 +715,11 @@ static void __meminit resize_pgdat_range(struct pglist_data *pgdat, unsigned lon
>
> pgdat->node_spanned_pages = max(start_pfn + nr_pages, old_end_pfn) - pgdat->node_start_pfn;
> }
> -
> +/*
> + * Associate the pfn range with the given zone, initializing the memmaps
> + * and resizing the pgdat/zone data to span the added pages. After this
> + * call, all affected pages are PG_reserved.
> + */
> void __ref move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn,
> unsigned long nr_pages, struct vmem_altmap *altmap)
> {
> @@ -804,20 +808,6 @@ struct zone * zone_for_pfn_range(int online_type, int nid, unsigned start_pfn,
> return default_zone_for_pfn(nid, start_pfn, nr_pages);
> }
>
> -/*
> - * Associates the given pfn range with the given node and the zone appropriate
> - * for the given online type.
> - */
> -static struct zone * __meminit move_pfn_range(int online_type, int nid,
> - unsigned long start_pfn, unsigned long nr_pages)
> -{
> - struct zone *zone;
> -
> - zone = zone_for_pfn_range(online_type, nid, start_pfn, nr_pages);
> - move_pfn_range_to_zone(zone, start_pfn, nr_pages, NULL);
> - return zone;
> -}
> -
> int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_type)
> {
> unsigned long flags;
> @@ -840,7 +830,8 @@ int __ref online_pages(unsigned long pfn, unsigned long nr_pages, int online_typ
> put_device(&mem->dev);
>
> /* associate pfn range with the zone */
> - zone = move_pfn_range(online_type, nid, pfn, nr_pages);
> + zone = zone_for_pfn_range(online_type, nid, pfn, nr_pages);
> + move_pfn_range_to_zone(zone, pfn, nr_pages, NULL);
>
> arg.start_pfn = pfn;
> arg.nr_pages = nr_pages;
> --
> 2.21.0
>
--
Oscar Salvador
SUSE L3
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-07-26 11:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-24 14:23 [PATCH v1] mm/memory_hotplug: Remove move_pfn_range() David Hildenbrand
2019-07-24 15:45 ` Michal Hocko
2019-07-24 15:49 ` David Hildenbrand
2019-07-26 11:09 ` Oscar Salvador
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.