From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751536AbdJCTLp (ORCPT ); Tue, 3 Oct 2017 15:11:45 -0400 Received: from mail-eopbgr10107.outbound.protection.outlook.com ([40.107.1.107]:52304 "EHLO EUR02-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751148AbdJCTLm (ORCPT ); Tue, 3 Oct 2017 15:11:42 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=aryabinin@virtuozzo.com; From: Andrey Ryabinin To: Andrew Morton Cc: Kemi Wang , Mel Gorman , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Ryabinin Subject: [PATCH v2] mm/mempolicy: fix NUMA_INTERLEAVE_HIT counter Date: Tue, 3 Oct 2017 22:10:03 +0300 Message-Id: <20171003191003.8573-1-aryabinin@virtuozzo.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171003164720.22130-1-aryabinin@virtuozzo.com> References: <20171003164720.22130-1-aryabinin@virtuozzo.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [84.47.128.244] X-ClientProxiedBy: AM0PR0102CA0068.eurprd01.prod.exchangelabs.com (2603:10a6:208::45) To DB6PR08MB2822.eurprd08.prod.outlook.com (2603:10a6:6:1d::25) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f0781d0c-075d-47c9-d9c1-08d50a92932f X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(2017030254152)(2017052603199)(201703131423075)(201703031133081)(201702281549075);SRVR:DB6PR08MB2822; X-Microsoft-Exchange-Diagnostics: 1;DB6PR08MB2822;3:5BuqzB2vZeY2RbifUgSzKJQ+/Z9nAaTrGXcDLVb50giRChRWRDDkUHlu/+XEmQbBNQ85m0Xfv9zoRcQJFOAZtWfYmypJy1rK59FEBYCNya75qieRu+bwQhd2MwJmnfz42bzA3z04bwFRcQ8SGj+0Gnf41NGJ7rF3KDy1ZE5J2LxWaUn/8BqLMsonsqw/4c8HV0GmZaNztvwK/fxsnNsixwJlMemugp0Pv9Gz9NRpVBRRn7IKScMcBiRZfE6qeeEi;25:8nZDDoyNRuy/l12rVT4HoOXsSN0WBsFUCyKrMqKOacV+4WyXgfD+Mtd//B5NZeKfwyJeFr3jfIjSZ8YrAaRy1sML/sfT8GWmco78uXogMPX+wCPXhspwF0rDpYJJj0h8vDQhzn0bUyEzMiEq/z/uZeDoCExSGcNnkyhpDq7+qPcsbJRIFrg1XtA0DlLHM7upPjp7jYAOE5ELNvQ+RYKj4S/5bXDR/EnvwUZmad7wNKI/G1XcGMdTL1DpfIzEbjyhjPMIZmIKksxbpyr3sdPSsLw6/yIr7a7L44UjmQqsJQCyfuWSJ7idYSAx9GCW0EA1JhFVqmS8YAfbTu4gdqh6FQ==;31:0DGJ96RKiM/2wwqY4BqUGwuMuYrmo4YJYQzUb1MPbvv1UXleunUBtI/kpTAq15oCdRXcqwzSXA4DADYpZOs/yxxDmRESOv3VJVHtRviAZhuSfv6B4w1aw7n0zHDZcLvYxySWf7FcZt6ce9DUGKhqX1faO36TkgUdhGR2KgL8a6R7P11BFN3SefppEvWBdg1goephEdqQM2vIRtGHGK1nZqPr4F3P5nzwwX7w97fyb7I= X-MS-TrafficTypeDiagnostic: DB6PR08MB2822: X-Microsoft-Exchange-Diagnostics: 1;DB6PR08MB2822;20:OdkRzJwwcw0swcq2sowuQsTQw+MzRA3I+r78Lpeb/0lybw5AIHTAkoShudCpHi+c2Djh0AugVBAmUFcfejtD+z3w/qQB1VYtWMJcV+kD3CxT8GCkGkN8rQJoNs/sAtC8dfV/ffReK6rYUPOFbnd2OGxmK6p4UOLaBl+80D7I1nm90ydFl6JyUrVQyoMg4SbiB9d8jZsYNa6F+txOLor4U+GttfqCspt2rTNdS4QU4FZPDnyTSmNjY3fNieQAz0XupakHzW5pbXf4YwKrTtm3n14LOp5uM4cRxfdwVUr1aBbw9jcIfr1kPr8y+0LLHmrFIzTt8ZlUpkN9tgOCdRWEKymLV64aqRSs3It1EhxQiMVs3DBeZuQGRqXFthXdIrulJ+RWYLe9khS468dha3DnKdvxcthA0QnCONYG9prO524=;4:e/rBGBTzHK53IzSEJAUhbcSyT01XZ7m+YYfHsecaVytx1I1p5c1Riti67yW5JdrZlbOUDKhedElvptwnZuswnTmCZI7OPhodHmZsU8CDv+B4/m0NA+n5ecoQlGeh4nhy2qtSu9HgeVolG4FyYsjlZlYM5uim8yUqgKrQaInfyID67uznyRdwYzr4b5dTDwKTEw/tS7mHDbSVVl2HW5pFt8NYxmIOcg3M+AoI1+yJQEWKbyAo/9WuLiyHlok7N+Tu X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(100000703101)(100105400095)(6041248)(20161123562025)(20161123564025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:DB6PR08MB2822;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:DB6PR08MB2822; X-Forefront-PRVS: 044968D9E1 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6069001)(6009001)(376002)(346002)(189002)(199003)(53936002)(86362001)(47776003)(105586002)(4326008)(8676002)(106356001)(575784001)(50466002)(48376002)(50226002)(189998001)(101416001)(107886003)(478600001)(6512007)(66066001)(305945005)(6116002)(16586007)(6666003)(81156014)(81166006)(1076002)(6916009)(8936002)(2906002)(33646002)(50986999)(6486002)(97736004)(54906003)(7736002)(5660300001)(76176999)(6506006)(2950100002)(68736007)(36756003)(316002)(5003940100001)(25786009)(3846002);DIR:OUT;SFP:1102;SCL:1;SRVR:DB6PR08MB2822;H:localhost.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DB6PR08MB2822;23:ynD5pVPfTNDgNzBnJnHMWXAbhVbVAz94f9Y6fgAB1?= =?us-ascii?Q?1NO1fBxG1vsD3FysJt00o2NeNl7TjSIRtiqs7Nzvd3lvjDEpFvh6nQCp/6Ia?= =?us-ascii?Q?llD4NiD00phMKwrjsLODGkQcYGTKkkMDteUBPlmoLQB6+LB2ERrlPsSReDME?= =?us-ascii?Q?nBIPMiXulMxD/ZdP5PTS44/9CEPeSuzv6xrroioswL3V2obKskB8OBQqX/nn?= =?us-ascii?Q?tXgolaVHk3chwIMjVMkcm1rrKcgl8ZMzYEPlslAaDoWWdmKRVX3rQSLTWWCu?= =?us-ascii?Q?mUbbyTT07av4DW4ueUgm9DuzgTbV9tOeVnDs1kHGquvzCPbhyVBXHZy9sOpa?= =?us-ascii?Q?5YDJW9SzmMEHxYhAoDGQ4JwTTyRsYOC/2m3IS1g5krScSHuxZD6tRd/MA5NR?= =?us-ascii?Q?QwUHCCV7O2az1kBWPK6luEQndLiHAHqiTzEARyFWD0f/ZYj3UlXZaqdfRyb6?= =?us-ascii?Q?edGvO6EjjszU+O9p2bxtiVtcDx7OxCqQywe1+sew+es5vK5GKI5hBScTv26j?= =?us-ascii?Q?KAUIaeDw006WbVj8qrh5akGSUDTofUxSermNpZneKGSC9UcrSjNEC3eOfAAX?= =?us-ascii?Q?pboSLB3xqAw0QZaGxUyeMkxp/fZju7nAoLdcxxIUkzSHFRDQz9lqyZw47CBi?= =?us-ascii?Q?dkO85iv0AKoOXelceu+mnWoIHyUwrKnv93Fv+tJa3TaWirYIXuzgZw0pYtX+?= =?us-ascii?Q?tuH11KFAC2jzDHPjfYApL9lqGY96QEHPSTAR4xlbAzgw+2IlZIixlYv/7XLl?= =?us-ascii?Q?7NEbKY4dywCS57jxoJmZr9u9Kl1HbToSVOvIl1lwZ6IwulJ1t2vUJ7MGs3Ap?= =?us-ascii?Q?P2HrPafVN7vs2oy31PbHR2VhWyLjFVGzXhHRKdNxtKCEPTXjZiREt19V4luU?= =?us-ascii?Q?ZQVIl1Axe5jf9KspT9TOp2jHBXpv849jBpG1WN5AF5lrmTBSNxV0uzJ6QtKD?= =?us-ascii?Q?tlg/ba2G+twVKOqvuCs2A7Jos/MRSFcPi2utt2CITpIr2aQOITNc4OhA3NMX?= =?us-ascii?Q?LDE3tV8YYweK1qjVyXpI4aXEIMvzhYeliyu34M2UPws/fqfKwjFPArlOSSMa?= =?us-ascii?Q?8lT7Efar2A4Ozc8QJWzAHReFDq/05tlKNweldo6hnZXyKgLQaxc6r83qTA/X?= =?us-ascii?Q?cER/QjeYdTQpLUMnm00M4buMzT5g0r2?= X-Microsoft-Exchange-Diagnostics: 1;DB6PR08MB2822;6:VWgPvZb69WC/Y68GVFIvESJHLnn/dg2ioAMKKfBzpzP2epvQlHoIh4cvSwKRPrbR0CTEKY3Pl3nSeSRXsro0KcGf9S7MFsPvDb5daDVutQz16HLU65e+fnSb7ykL0CqE6s4CuIaPZvNduYfURz2gcGsG45bPhmGgm465Yx2ndy22JkzkOaZRSx32Bfd1zUyJxUnN7LLM+pVAWabYpOoqIMicsLyUKUq5XW7imaDL7G4Ii0Iz6Sa8OBACl5Jvrz/h5VS8zoXT7M2R81eETyKejaQR++V2FCzRpLCZbaTr0tSwc3oy1NDPuDqsfnUtT7Wq79yQOLYS0bbOS1XGEFVBuA==;5:45vE9cxdPZZn+dWbZG+VdSqILVqEwJEh8jUGL9dVuumw+yXxX8v+BEuc4T48cmsV2F18mc/tl5Lw/TjiE+A2gLm9G094/Yi2yUSXvHpPQd/nj1bHdO4+nFieK5lSIflKMfbBVRnWe/h3VYJOyUGjqw==;24:EzXqIyNIswB2c56TNTOS83jtaQ+clYlhviPzOYpBEAWSu6HnsBBuibEp5xrWFrnMiHlGsfVUZmzJRvkDsQp5HdctBPdxyRR1SFtCALsDibU=;7:FNSfc3NNzZ+/wjDnuluaJuFE5c0/nU9gmnDhHZBBevb03MtTc5V4PqnSXNb0bhgO23PvDFx0eWupMOQr99Rk/BG4wcXh6GGC+1Uj/GVrLvGdBby+AcPUlKVgkDLOZgflFMixgOobGuOhrtVs5y4vPKgwlOHmkWb2ynyIJE9PGYs9D1ZEkdUp9OYih935xzkqLrGwl4QLl95pgw04AQ/+Zb7hAOVQUMVrAozJRMw+1lI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DB6PR08MB2822;20:0tEk83Dw4na/2bIQRq3evzRtFpocV6tA9w6HcC0s3AsBbwbOVtFmkMN36g0F5suXViiNkf7bZenBbqFkr5fM77E3ZRUbgyb673buQo6LaCYZdbpm79DfV1hjBZAhj7pjGNTVIHQDokeSn5Z+3RDL7pt11vhPwovtCfE0hKwrDrA= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2017 19:11:37.9776 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR08MB2822 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit 3a321d2a3dde separated NUMA counters from zone counters, but the NUMA_INTERLEAVE_HIT call site wasn't updated to use the new interface. So alloc_page_interleave() actually increments NR_ZONE_INACTIVE_FILE instead of NUMA_INTERLEAVE_HIT. Fix this by using __inc_numa_state() interface to increment NUMA_INTERLEAVE_HIT. Fixes: 3a321d2a3dde ("mm: change the call sites of numa statistics items") Signed-off-by: Andrey Ryabinin --- mm/mempolicy.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 006ba625c0b8..a2af6d58a68f 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1920,8 +1920,11 @@ static struct page *alloc_page_interleave(gfp_t gfp, unsigned order, struct page *page; page = __alloc_pages(gfp, order, nid); - if (page && page_to_nid(page) == nid) - inc_zone_page_state(page, NUMA_INTERLEAVE_HIT); + if (page && page_to_nid(page) == nid) { + preempt_disable(); + __inc_numa_state(page_zone(page), NUMA_INTERLEAVE_HIT); + preempt_enable(); + } return page; } -- 2.13.6