From: Michal Hocko <mhocko@kernel.org>
To: Mel Gorman <mgorman@suse.de>
Cc: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>,
Johannes Weiner <hannes@cmpxchg.org>,
Vlastimil Babka <vbabka@suse.cz>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 6/9] mm, page_alloc: simplify zonelist initialization
Date: Mon, 17 Jul 2017 08:06:40 +0200 [thread overview]
Message-ID: <20170717060639.GA7397@dhcp22.suse.cz> (raw)
In-Reply-To: <20170714141823.2j7t37t6zdzdf3sv@suse.de>
On Fri 14-07-17 15:18:23, Mel Gorman wrote:
> On Fri, Jul 14, 2017 at 03:02:42PM +0200, Michal Hocko wrote:
[...]
> > What do you think about this on top?
> > ---
> > diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> > index 49bade7ff049..3b98524c04ec 100644
> > --- a/mm/page_alloc.c
> > +++ b/mm/page_alloc.c
> > @@ -4913,20 +4913,21 @@ static int find_next_best_node(int node, nodemask_t *used_node_mask)
> > * This results in maximum locality--normal zone overflows into local
> > * DMA zone, if any--but risks exhausting DMA zone.
> > */
> > -static void build_zonelists_in_node_order(pg_data_t *pgdat, int *node_order)
> > +static void build_zonelists_in_node_order(pg_data_t *pgdat, int *node_order,
> > + unsigned nr_nodes)
> > {
> > struct zonelist *zonelist;
> > - int i, zoneref_idx = 0;
> > + int i, nr_zones = 0;
> >
> > zonelist = &pgdat->node_zonelists[ZONELIST_FALLBACK];
> >
> > - for (i = 0; i < MAX_NUMNODES; i++) {
> > + for (i = 0; i < nr_nodes; i++) {
>
> The first iteration is then -- for (i = 0; i < 0; i++)
find_next_best_node always returns at least one node (the local one) so
I believe that nr_nodes should never be 0.
> Fairly sure that's not what you meant.
>
>
> > pg_data_t *node = NODE_DATA(node_order[i]);
> >
> > - zoneref_idx = build_zonelists_node(node, zonelist, zoneref_idx);
> > + nr_zones = build_zonelists_node(node, zonelist, nr_zones);
>
> I meant converting build_zonelists_node and passing in &nr_zones and
> returning false when an empty node is encountered. In this context,
> it's also not about zones, it really is nr_zonerefs. Rename nr_zones in
> build_zonelists_node as well.
hmm, why don't we rather make it zonerefs based then. Something
like the following?
---
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 3b98524c04ec..01e67e629351 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4772,18 +4772,17 @@ static void zoneref_set_zone(struct zone *zone, struct zoneref *zoneref)
*
* Add all populated zones of a node to the zonelist.
*/
-static int build_zonelists_node(pg_data_t *pgdat, struct zonelist *zonelist,
- int nr_zones)
+static int build_zonerefs_node(pg_data_t *pgdat, struct zoneref *zonerefs)
{
struct zone *zone;
enum zone_type zone_type = MAX_NR_ZONES;
+ int nr_zones = 0;
do {
zone_type--;
zone = pgdat->node_zones + zone_type;
if (managed_zone(zone)) {
- zoneref_set_zone(zone,
- &zonelist->_zonerefs[nr_zones++]);
+ zoneref_set_zone(zone, &zonerefs[nr_zones++]);
check_highest_zone(zone_type);
}
} while (zone_type);
@@ -4916,18 +4915,21 @@ static int find_next_best_node(int node, nodemask_t *used_node_mask)
static void build_zonelists_in_node_order(pg_data_t *pgdat, int *node_order,
unsigned nr_nodes)
{
- struct zonelist *zonelist;
- int i, nr_zones = 0;
+ struct zoneref *zonerefs;
+ int i;
- zonelist = &pgdat->node_zonelists[ZONELIST_FALLBACK];
+ zonerefs = pgdat->node_zonelists[ZONELIST_FALLBACK]._zonerefs;
for (i = 0; i < nr_nodes; i++) {
+ int nr_zones;
+
pg_data_t *node = NODE_DATA(node_order[i]);
- nr_zones = build_zonelists_node(node, zonelist, nr_zones);
+ nr_zones = build_zonerefs_node(node, zonerefs);
+ zonerefs += nr_zones;
}
- zonelist->_zonerefs[nr_zones].zone = NULL;
- zonelist->_zonerefs[nr_zones].zone_idx = 0;
+ zonerefs->zone = NULL;
+ zonerefs->zone_idx = 0;
}
/*
@@ -4935,13 +4937,14 @@ static void build_zonelists_in_node_order(pg_data_t *pgdat, int *node_order,
*/
static void build_thisnode_zonelists(pg_data_t *pgdat)
{
- struct zonelist *zonelist;
- int nr_zones = 0;
+ struct zoneref *zonerefs;
+ int nr_zones;
- zonelist = &pgdat->node_zonelists[ZONELIST_NOFALLBACK];
- nr_zones = build_zonelists_node(pgdat, zonelist, nr_zones);
- zonelist->_zonerefs[nr_zones].zone = NULL;
- zonelist->_zonerefs[nr_zones].zone_idx = 0;
+ zonerefs = pgdat->node_zonelists[ZONELIST_NOFALLBACK]._zonerefs;
+ nr_zones = build_zonerefs_node(pgdat, zonerefs);
+ zonerefs += nr_zones;
+ zonerefs->zone = NULL;
+ zonerefs->zone_idx = 0;
}
/*
@@ -5009,13 +5012,13 @@ static void setup_min_slab_ratio(void);
static void build_zonelists(pg_data_t *pgdat)
{
int node, local_node;
- enum zone_type j;
- struct zonelist *zonelist;
+ struct zoneref *zonerefs;
local_node = pgdat->node_id;
- zonelist = &pgdat->node_zonelists[ZONELIST_FALLBACK];
- j = build_zonelists_node(pgdat, zonelist, 0);
+ zonrefs = pgdat->node_zonelists[ZONELIST_FALLBACK]._zonerefs;
+ nr_zones = build_zonerefs_node(pgdat, zonerefs);
+ zonerefs += nr_zones;
/*
* Now we build the zonelist so that it contains the zones
@@ -5028,16 +5031,18 @@ static void build_zonelists(pg_data_t *pgdat)
for (node = local_node + 1; node < MAX_NUMNODES; node++) {
if (!node_online(node))
continue;
- j = build_zonelists_node(NODE_DATA(node), zonelist, j);
+ nr_zones = build_zonerefs_node(NODE_DATA(node), zonerefs);
+ zonerefs += nr_zones;
}
for (node = 0; node < local_node; node++) {
if (!node_online(node))
continue;
- j = build_zonelists_node(NODE_DATA(node), zonelist, j);
+ nr_zones = build_zonerefs_node(NODE_DATA(node), zonerefs);
+ zonerefs += nr_zones;
}
- zonelist->_zonerefs[j].zone = NULL;
- zonelist->_zonerefs[j].zone_idx = 0;
+ zonerefs->zone = NULL;
+ zonerefs->zone_idx = 0;
}
#endif /* CONFIG_NUMA */
--
Michal Hocko
SUSE Labs
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-07-17 6:06 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-14 7:59 [PATCH 0/9] cleanup zonelists initialization Michal Hocko
2017-07-14 7:59 ` [PATCH 1/9] mm, page_alloc: rip out ZONELIST_ORDER_ZONE Michal Hocko
2017-07-14 9:36 ` Mel Gorman
2017-07-14 10:47 ` Michal Hocko
2017-07-14 11:16 ` Mel Gorman
2017-07-14 11:38 ` Michal Hocko
2017-07-14 12:56 ` Mel Gorman
2017-07-14 13:01 ` Mel Gorman
2017-07-14 13:08 ` Michal Hocko
2017-07-19 9:33 ` Vlastimil Babka
2017-07-19 13:44 ` Michal Hocko
2017-07-14 7:59 ` [PATCH 2/9] mm, page_alloc: remove boot pageset initialization from memory hotplug Michal Hocko
2017-07-14 9:39 ` Mel Gorman
2017-07-19 13:15 ` Vlastimil Babka
2017-07-14 8:00 ` [PATCH 3/9] mm, page_alloc: do not set_cpu_numa_mem on empty nodes initialization Michal Hocko
2017-07-14 9:48 ` Mel Gorman
2017-07-14 10:50 ` Michal Hocko
2017-07-14 12:32 ` Mel Gorman
2017-07-14 12:39 ` Michal Hocko
2017-07-14 12:56 ` Mel Gorman
2017-07-19 13:19 ` Vlastimil Babka
2017-07-14 8:00 ` [PATCH 4/9] mm, memory_hotplug: drop zone from build_all_zonelists Michal Hocko
2017-07-19 13:33 ` Vlastimil Babka
2017-07-20 8:15 ` Michal Hocko
2017-07-14 8:00 ` [PATCH 5/9] mm, memory_hotplug: remove explicit build_all_zonelists from try_online_node Michal Hocko
2017-07-14 12:14 ` Michal Hocko
2017-07-20 6:13 ` Vlastimil Babka
2017-07-14 8:00 ` [PATCH 6/9] mm, page_alloc: simplify zonelist initialization Michal Hocko
2017-07-14 9:55 ` Mel Gorman
2017-07-14 10:51 ` Michal Hocko
2017-07-14 12:46 ` Mel Gorman
2017-07-14 13:02 ` Michal Hocko
2017-07-14 14:18 ` Mel Gorman
2017-07-17 6:06 ` Michal Hocko [this message]
2017-07-17 8:07 ` Mel Gorman
2017-07-17 8:19 ` Michal Hocko
2017-07-17 8:58 ` Mel Gorman
2017-07-17 9:15 ` Michal Hocko
2017-07-20 6:55 ` Vlastimil Babka
2017-07-20 7:19 ` Michal Hocko
2017-07-14 8:00 ` [PATCH 7/9] mm, page_alloc: remove stop_machine from build_all_zonelists Michal Hocko
2017-07-14 9:59 ` Mel Gorman
2017-07-14 11:00 ` Michal Hocko
2017-07-14 12:47 ` Mel Gorman
2017-07-14 11:29 ` Vlastimil Babka
2017-07-14 11:43 ` Michal Hocko
2017-07-14 11:45 ` Michal Hocko
2017-07-20 6:16 ` Vlastimil Babka
2017-07-20 7:24 ` Vlastimil Babka
2017-07-20 9:21 ` Michal Hocko
2017-07-14 8:00 ` [PATCH 8/9] mm, memory_hotplug: get rid of zonelists_mutex Michal Hocko
2017-07-14 8:00 ` [PATCH 9/9] mm, sparse, page_ext: drop ugly N_HIGH_MEMORY branches for allocations Michal Hocko
2017-07-20 8:04 ` Vlastimil Babka
2017-07-21 14:39 [PATCH -v1 0/9] cleanup zonelists initialization Michal Hocko
2017-07-21 14:39 ` [PATCH 6/9] mm, page_alloc: simplify zonelist initialization Michal Hocko
2017-07-24 9:25 ` Vlastimil Babka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170717060639.GA7397@dhcp22.suse.cz \
--to=mhocko@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=hannes@cmpxchg.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=vbabka@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).