From patchwork Thu Jul 19 13:27:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 10534413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 42BF4601D2 for ; Thu, 19 Jul 2018 13:27:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2BB2B298CC for ; Thu, 19 Jul 2018 13:27:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1FC66298E1; Thu, 19 Jul 2018 13:27:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 86664298CC for ; Thu, 19 Jul 2018 13:27:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 666A16B026A; Thu, 19 Jul 2018 09:27:49 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 614256B026C; Thu, 19 Jul 2018 09:27:49 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4BE7C6B026D; Thu, 19 Jul 2018 09:27:49 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-wm0-f69.google.com (mail-wm0-f69.google.com [74.125.82.69]) by kanga.kvack.org (Postfix) with ESMTP id E8B286B026A for ; Thu, 19 Jul 2018 09:27:48 -0400 (EDT) Received: by mail-wm0-f69.google.com with SMTP id q26-v6so845212wmc.0 for ; Thu, 19 Jul 2018 06:27:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=77A9+rW8amb86L2JkMZP3auBwcWTGSGmGoibnY+fYSg=; b=Hnn/Sc2x/Z5czzlVhIZoOR4wUPHzsJhN9ZUR2u5lcTpfHR2m6cqZR6PFjuv2yxHl9u mmaMZ/PYj666INiUu+/WIO8glOmaGcdYE6N4nrHXt8pY9lJpQYzfDK+cFo3C9Ruf4i0V jexKSPNQsUE04CeTC91heB9K2G2TjzrVbajPvsLgBhTENxO5gW2ZKNMDTKKf1gWpVXGs HVNvNcV1ft5+icRMkrCViiDOFdr+v5uL3W9ZN8i23jRx9MxlKkLOFbpPUN45u0UJjLhJ fUxpQilLCOSLiHThP8mCVHReEVQJrzEKOpPL/o4pLG6+096637A4qhjHTrz1Qd6Qt6Cg f+zg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=osalvador.vilardaga@gmail.com X-Gm-Message-State: AOUpUlHhZmovtFlhmara1TP6F9HMh6zkWWsX8iXgrr/QwvODnCcNEqKg OkZdrOuA1anQnwPmGiCKj9ENGEvDMjtLrs1v7v7TJpEmsBDZmSjWs14qsB2Qv1Xqcdb1g3HimH3 NHLlDYge2m+xMWVPXWtgHClxj22jdnWae8LCmSK/nkJ+17p9UHsOXizKT3QvmHx5zMp/No5tcHs Uc+WbHA0ORCWzn7c8XXs0VvdCYscZ1PCHp0SZvM672vFFgsKBxjoJg/m6aUrYDuDlg3DY9b2+JZ ZqSzoMREIBvvGzmlO5cG88jjBFQi9zhsTYKZ6PTMaMdn5undqD80lGYrr5AxmevkCeteI18dEoa 7mU1eLT1mr2HpaFYD8dKEhT0GblTuyK3DVbbvWjuIk9J7EsOq/xdjjsoYvupGMo4YvC4m/Hbnw= = X-Received: by 2002:adf:ce88:: with SMTP id r8-v6mr7322479wrn.112.1532006868532; Thu, 19 Jul 2018 06:27:48 -0700 (PDT) X-Received: by 2002:adf:ce88:: with SMTP id r8-v6mr7322441wrn.112.1532006867478; Thu, 19 Jul 2018 06:27:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532006867; cv=none; d=google.com; s=arc-20160816; b=XYM3q08oYZiLX+uifTDQQDMB7lLsTGDA8PuHOO8Y2QzHWa0AIMbt9qe6mby0/ugivQ zO0f0g7nOyK07Nl36sHOLPIaxzkP6DKfkS/nwPOmSGZ2Qzgjc7ocpf8GzDkVWPKFMqBX 0UwgUZGAFGIronQLjXgbjq/eKg0Vtab4SNImsyrCQSCEQgPxXNSGoSsuNtg/GXn6tdx5 9J2RI3VLAxQsLybKqzH9Jsmku+QSl1dpDt/IS+FtkJxmN+dhdXROj8NMc+TAzDz7ZlTA Ri5M5HxGKnSHzZNTGmcYh1b3LDOE8i76KgZy5KOJXfngpH71x9rxH7EjK1mBlI1Eslpl 0R3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=77A9+rW8amb86L2JkMZP3auBwcWTGSGmGoibnY+fYSg=; b=vdlLSSTVu+bEuG+Hkswk6vpXCwiLwzIT3X6fCXXnVIAFoU8nnFifRdRh3cfroAnntU fzLwMzjjVBWoVp+izFUNi9gpMWdpeiFAHrZ75krDCFEwRlRJByHLS5lwh8zvHt5Ny1r7 l5AnfnF1rC9yhDThKEeLHGp63NtlTHRGzf7KF2kBjTBUuqkwrnBem9+PgoBLdyxkT7OV A9jl4/stt7c+GaejHpNsNV4zFwQRxnh65hfvn8vjiwKrfIqmcOMpzkRvvCvnwSteCjnD YgKA4Fy4YaZD29rYLlL6o1PZiMgJz7owrwSN8GOiKoqwzMOdRszBhC5xaz2WupfHLfBt OQfQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=osalvador.vilardaga@gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id b63-v6sor1186380wmc.6.2018.07.19.06.27.47 for (Google Transport Security); Thu, 19 Jul 2018 06:27:47 -0700 (PDT) Received-SPF: pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; spf=pass (google.com: domain of osalvador.vilardaga@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=osalvador.vilardaga@gmail.com X-Google-Smtp-Source: AAOMgpcZ7oJCoMV/6JyMP9CIhb0YB9uawLWf2egkgpMds/G6tTtM55DoWd8xj8tovXUvTiHasRx9Rw== X-Received: by 2002:a1c:9c56:: with SMTP id f83-v6mr3996383wme.135.1532006867138; Thu, 19 Jul 2018 06:27:47 -0700 (PDT) Received: from techadventures.net (techadventures.net. [62.201.165.239]) by smtp.gmail.com with ESMTPSA id q70-v6sm9199417wmd.45.2018.07.19.06.27.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Jul 2018 06:27:45 -0700 (PDT) Received: from d104.suse.de (charybdis-ext.suse.de [195.135.221.2]) by techadventures.net (Postfix) with ESMTPA id E5385124173; Thu, 19 Jul 2018 15:27:44 +0200 (CEST) From: osalvador@techadventures.net To: akpm@linux-foundation.org Cc: pasha.tatashin@oracle.com, mhocko@suse.com, vbabka@suse.cz, aaron.lu@intel.com, iamjoonsoo.kim@lge.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Oscar Salvador Subject: [PATCH v2 2/5] mm: access zone->node via zone_to_nid() and zone_set_nid() Date: Thu, 19 Jul 2018 15:27:37 +0200 Message-Id: <20180719132740.32743-3-osalvador@techadventures.net> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180719132740.32743-1-osalvador@techadventures.net> References: <20180719132740.32743-1-osalvador@techadventures.net> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Pavel Tatashin zone->node is configured only when CONFIG_NUMA=y, so it is a good idea to have inline functions to access this field in order to avoid ifdef's in c files. Signed-off-by: Pavel Tatashin Signed-off-by: Oscar Salvador Reviewed-by: Oscar Salvador Acked-by: Michal Hocko --- include/linux/mm.h | 9 --------- include/linux/mmzone.h | 26 ++++++++++++++++++++------ mm/mempolicy.c | 4 ++-- mm/mm_init.c | 9 ++------- mm/page_alloc.c | 10 ++++------ 5 files changed, 28 insertions(+), 30 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 726e71475144..6954ad183159 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -940,15 +940,6 @@ static inline int page_zone_id(struct page *page) return (page->flags >> ZONEID_PGSHIFT) & ZONEID_MASK; } -static inline int zone_to_nid(struct zone *zone) -{ -#ifdef CONFIG_NUMA - return zone->node; -#else - return 0; -#endif -} - #ifdef NODE_NOT_IN_PAGE_FLAGS extern int page_to_nid(const struct page *page); #else diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index ae1a034c3e2c..17fdff3bfb41 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -842,6 +842,25 @@ static inline bool populated_zone(struct zone *zone) return zone->present_pages; } +#ifdef CONFIG_NUMA +static inline int zone_to_nid(struct zone *zone) +{ + return zone->node; +} + +static inline void zone_set_nid(struct zone *zone, int nid) +{ + zone->node = nid; +} +#else +static inline int zone_to_nid(struct zone *zone) +{ + return 0; +} + +static inline void zone_set_nid(struct zone *zone, int nid) {} +#endif + extern int movable_zone; #ifdef CONFIG_HIGHMEM @@ -957,12 +976,7 @@ static inline int zonelist_zone_idx(struct zoneref *zoneref) static inline int zonelist_node_idx(struct zoneref *zoneref) { -#ifdef CONFIG_NUMA - /* zone_to_nid not available in this context */ - return zoneref->zone->node; -#else - return 0; -#endif /* CONFIG_NUMA */ + return zone_to_nid(zoneref->zone); } struct zoneref *__next_zones_zonelist(struct zoneref *z, diff --git a/mm/mempolicy.c b/mm/mempolicy.c index f0fcf70bcec7..8c1c09b3852a 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1784,7 +1784,7 @@ unsigned int mempolicy_slab_node(void) zonelist = &NODE_DATA(node)->node_zonelists[ZONELIST_FALLBACK]; z = first_zones_zonelist(zonelist, highest_zoneidx, &policy->v.nodes); - return z->zone ? z->zone->node : node; + return z->zone ? zone_to_nid(z->zone) : node; } default: @@ -2326,7 +2326,7 @@ int mpol_misplaced(struct page *page, struct vm_area_struct *vma, unsigned long node_zonelist(numa_node_id(), GFP_HIGHUSER), gfp_zone(GFP_HIGHUSER), &pol->v.nodes); - polnid = z->zone->node; + polnid = zone_to_nid(z->zone); break; default: diff --git a/mm/mm_init.c b/mm/mm_init.c index 5b72266b4b03..6838a530789b 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -53,13 +53,8 @@ void __init mminit_verify_zonelist(void) zone->name); /* Iterate the zonelist */ - for_each_zone_zonelist(zone, z, zonelist, zoneid) { -#ifdef CONFIG_NUMA - pr_cont("%d:%s ", zone->node, zone->name); -#else - pr_cont("0:%s ", zone->name); -#endif /* CONFIG_NUMA */ - } + for_each_zone_zonelist(zone, z, zonelist, zoneid) + pr_cont("%d:%s ", zone_to_nid(zone), zone->name); pr_cont("\n"); } } diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 8a73305f7c55..10b754fba5fa 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2909,10 +2909,10 @@ static inline void zone_statistics(struct zone *preferred_zone, struct zone *z) if (!static_branch_likely(&vm_numa_stat_key)) return; - if (z->node != numa_node_id()) + if (zone_to_nid(z) != numa_node_id()) local_stat = NUMA_OTHER; - if (z->node == preferred_zone->node) + if (zone_to_nid(z) == zone_to_nid(preferred_zone)) __inc_numa_state(z, NUMA_HIT); else { __inc_numa_state(z, NUMA_MISS); @@ -5287,7 +5287,7 @@ int local_memory_node(int node) z = first_zones_zonelist(node_zonelist(node, GFP_KERNEL), gfp_zone(GFP_KERNEL), NULL); - return z->zone->node; + return zone_to_nid(z->zone); } #endif @@ -6311,9 +6311,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat) * And all highmem pages will be managed by the buddy system. */ zone->managed_pages = freesize; -#ifdef CONFIG_NUMA - zone->node = nid; -#endif + zone_set_nid(zone, nid); zone->name = zone_names[j]; zone->zone_pgdat = pgdat; spin_lock_init(&zone->lock);