From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S933141AbcLSKFx (ORCPT <rfc822;w@1wt.eu>);
        Mon, 19 Dec 2016 05:05:53 -0500
Received: from mx2.suse.de ([195.135.220.15]:46710 "EHLO mx2.suse.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S932960AbcLSKFw (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 19 Dec 2016 05:05:52 -0500
Date: Mon, 19 Dec 2016 11:05:49 +0100
From: Petr Mladek <pmladek@suse.com>
To: Vlastimil Babka <vbabka@suse.cz>
Cc: Michal Hocko <mhocko@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Mel Gorman <mgorman@suse.de>, Johannes Weiner <hannes@cmpxchg.org>,
        Joonsoo Kim <js1304@gmail.com>, linux-mm@kvack.org,
        LKML <linux-kernel@vger.kernel.org>, Michal Hocko <mhocko@suse.com>,
        Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Subject: Re: [PATCH] mm: simplify node/zone name printing
Message-ID: <20161219100549.GL393@pathway.suse.cz>
References: <20161216123232.26307-1-mhocko@kernel.org>
 <2094d241-f40b-2f21-b90b-059374bcd2c2@suse.cz>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <2094d241-f40b-2f21-b90b-059374bcd2c2@suse.cz>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Mon 2016-12-19 08:00:47, Vlastimil Babka wrote:
> On 12/16/2016 01:32 PM, Michal Hocko wrote:
> > From: Michal Hocko <mhocko@suse.com>
> > 
> > show_node currently only prints Node id while it is always followed by
> > printing zone->name. As the node information is conditional to
> > CONFIG_NUMA we have to be careful to always terminate the previous
> > continuation line before printing the zone name. This is quite ugly
> > and easy to mess up. Let's rename show_node to show_zone_node and
> > make sure that it will always start at a new line. We can drop the ugly
> > printk(KERN_CONT "\n") from show_free_areas.
> > 
> > Signed-off-by: Michal Hocko <mhocko@suse.com>
> 
> > diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> > index 3f2c9e535f7f..5324efa8b9d0 100644
> > --- a/mm/page_alloc.c
> > +++ b/mm/page_alloc.c
> > @@ -4120,10 +4120,12 @@ unsigned long nr_free_pagecache_pages(void)
> >  	return nr_free_zone_pages(gfp_zone(GFP_HIGHUSER_MOVABLE));
> >  }
> >  
> > -static inline void show_node(struct zone *zone)
> > +static inline void show_zone_node(struct zone *zone)
> >  {
> >  	if (IS_ENABLED(CONFIG_NUMA))
> > -		printk("Node %d ", zone_to_nid(zone));
> > +		printk("Node %d %s", zone_to_nid(zone), zone->name);
> > +	else
> > +		printk("%s: ", zone->name);
> >  }
> >  
> >  long si_mem_available(void)
> > @@ -4371,9 +4373,8 @@ void show_free_areas(unsigned int filter)
> >  		for_each_online_cpu(cpu)
> >  			free_pcp += per_cpu_ptr(zone->pageset, cpu)->pcp.count;
> >  
> > -		show_node(zone);
> > +		show_zone_node(zone);
> >  		printk(KERN_CONT
> > -			"%s"

The new code will printk "%s: " when called with disabled CONFIG_NUMA.
Is the added ": " OK?

Best Regards,
Petr