From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752024AbdJCQod (ORCPT ); Tue, 3 Oct 2017 12:44:33 -0400 Received: from mail-eopbgr20109.outbound.protection.outlook.com ([40.107.2.109]:41927 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751132AbdJCQoc (ORCPT ); Tue, 3 Oct 2017 12:44:32 -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] mm/mempolicy: fix NUMA_INTERLEAVE_HIT counter Date: Tue, 3 Oct 2017 19:47:20 +0300 Message-Id: <20171003164720.22130-1-aryabinin@virtuozzo.com> X-Mailer: git-send-email 2.13.6 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB6PR1001CA0037.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:55::23) To AM4PR08MB2820.eurprd08.prod.outlook.com (2603:10a6:205:d::26) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 13a18075-72e6-438f-a788-08d50a7e0433 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(2017030254152)(2017052603199)(201703131423075)(201703031133081)(201702281549075);SRVR:AM4PR08MB2820; X-Microsoft-Exchange-Diagnostics: 1;AM4PR08MB2820;3:lL8s1tvYpA3UfDG8lOahtb11PteRTTgidGggsgbEpptR7XcRk3dPBlgYfz6LHI7WAQkqoh3seVrISk5xUPP/dnhvXVlTeo2VZu+9FW6lJW7Ohuobc0bBFQn9NpD9wG4lc0LTohTqOuaPI0JEIogTGKAB08SkIIVII3T3nJY4RjGxQCu59GILwnm7tWjHmu+JaBCgO/0kr0e1MSNSP957CNoXeVuNoTSJW0Dmj568D8MCCrer2DHbE9NvBCza4FKh;25:gpnMAxyZnQCdoD6HV3Uvmd4UQvNzFOAao57PvY8ETo+sn9EbDPnnkwxFBGTMO8we7uPkbFcyX6/C0KN+cb/jp324R2KogPY6y4QRQ2GbA1UQU63HfJcbua5w8RrGgsLkxNLq3w0j7zBL/4a4FOEOBQc/dRRkjNIqdZN+DBvDykMpjVBDV3+6zQWNkatEPdZLmyeL7qiHHqMzs7UzQMxUg4MW35iUBSXPQk3Z/cREM28zMnKEjjE8ejg7V6xzHLkSJ0aAAVH7BNltUsOXxDRvJiGkvLLOQ0+PmSdPoEkSDasG5+6uYNG+AgQOE8sJs3SywUlqWEhQBjqCzDmxiupQtQ==;31:6zvgHqttmD+2NsjvLR+zNaL1Y3IcKvRK9RMulfVNZFK1LpR8DxAfr8VnO6/F7kn/ti7ppO2IhpLx7LgNA7wXR4DNGBA1tG7i3jWv2IzUVmkQ3ZggEUCt2sGeOfxpMamwrNfmuJcJJyvlRnbLRbeVBUmcOK7TpZZSZB2VJFUgQgOuPjIuC2L465wtUdiv4lP/0qmLbV1lrN+t9HdxJ69NiSFYVKIQyfFBVMwKVEWM2DQ= X-MS-TrafficTypeDiagnostic: AM4PR08MB2820: X-Microsoft-Exchange-Diagnostics: 1;AM4PR08MB2820;20:yyxg4xun4awCor1AOQuAduR1DSUc9XDAq3l2jQYY4RnaDmK6XRwnFGczMZG4x1UEwQ79GcJx6WhcmF4GaZfHMaDv7hqAkpWbQCHprdKvn0t6io0fMdjEyzYLK8/pNsJPTjmbSiqL7zWf6cBgpdcLQOSsryJZJHVfx8/bNqaT9akyHr6fBG8H/y91u3CxEsKnRqBxcgB1x43YmGLslSuXqeFNnMDsLC4DqOO965+6mzNn00Qmu7tpklDQwc0lJDS0I2ppjrz/xGhOjXCQ5bq+Od/AYtPgOBj2jHC1PkAjM9q/FkyZF2Ofem6T3Nc94IcLpath2Jfq9vyHBMMtTcG43JckkjHdAtcoAsG70lnBnNs+dABYAKv+PgNc08d0Dcg12jwwAgORCBQduVH15tzcsg915kQFPjhwcHCIQ5BAa9I=;4:OEQy0fMKJQ2SXWmEWEuEhoaiummrXqv8tw0yd03YKkOhqMt3gkmGAVgOS13yzf/bnhmcIapExXCI1Y1m59uYD7R9FnmjAx/666XLpEA1BOC9CbuMpIRGXUC1uH3jlEJK9SwQbB46JBs8ApSyqNup5bqOKifyoLS9ce4aMGsBU9kyF7w9NxThuykigRGWKCtf7iiWVNGZ018x9osLJn6KGuzz2uC7PaskmeDFvN3B4IK3zeJ9K9XEGQwD9EAmSemJ 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)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(100000703101)(100105400095)(6041248)(20161123558100)(20161123564025)(20161123555025)(20161123560025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:AM4PR08MB2820;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:AM4PR08MB2820; X-Forefront-PRVS: 044968D9E1 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(6069001)(376002)(346002)(189002)(199003)(97736004)(36756003)(2906002)(6916009)(6486002)(7736002)(6506006)(3846002)(50226002)(316002)(54906003)(101416001)(6512007)(66066001)(5003940100001)(47776003)(53936002)(107886003)(478600001)(189998001)(8936002)(305945005)(6666003)(1076002)(25786009)(76506005)(6116002)(86362001)(16586007)(68736007)(5660300001)(4326008)(575784001)(16526017)(53416004)(33646002)(106356001)(8676002)(81166006)(50986999)(50466002)(48376002)(81156014)(105586002)(69596002);DIR:OUT;SFP:1102;SCL:1;SRVR:AM4PR08MB2820;H:localhost.sw.ru;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;AM4PR08MB2820;23:Wti2JLPTbiOKruOs+JCpeFTtvD2+2WBebB4m1k6Y7?= =?us-ascii?Q?A0UufUYPhrLxOBrGMmO9HOqlQdY/vHGEKwSU4kBiUoQA1JKipUOnh6sOvDhB?= =?us-ascii?Q?HK/JJ/ec/c6P0wkpPXiFReyMzHL4XZj/lecMAQM9Uj4CKMpB1EnE/vuwzlXV?= =?us-ascii?Q?R+g4iKgdLeV93mW2yiImZgt8Q9UpU2AUbz8mpTXc5+2td3YDkpeh93PK+s+b?= =?us-ascii?Q?swz/aJ/g5q2XePmq+hU3YRsyqw330WZzEjxcBZvcTLsTTk4lvSejgnnUnHya?= =?us-ascii?Q?2ecaJu6P0YAAh8W+tfvwA69eLvlsNZAhDJ17/NFazsQfip+w2kSMTjmjZ5HB?= =?us-ascii?Q?BtKs5pRL1F5GP1Oynx7Ylel9OO0pFEs6DlArCGE9Vw7I4vncKi9AF8LXMT8B?= =?us-ascii?Q?UFkw+b+EJv6oAbTpBPhGSzuooG58fkEqFbrjHtsGA/pcc+8vHWIOCrKocxai?= =?us-ascii?Q?zse/upThHViuo5DDM6SBFGt942qG2m/saoL8wvITKXax/+1lsYjre3No7wVx?= =?us-ascii?Q?1zFNh49ZDP8aqniPvenDpSfMFJJcNlrpaxOt+yOKm1ZMQH2s+y6RjXVQt0TI?= =?us-ascii?Q?ALgD/lUBSKcNdof2duMQaa1SsbSv+nariYkVi+dakfejjNV52sC/AuFdRPv9?= =?us-ascii?Q?8NC+s/3fj56w/mLt3vGxTtJz59ZVdqAogr0qWZdZ7L+fvie92OnBertGY8yd?= =?us-ascii?Q?kGeF4mQYW7E7EOnRGQ2596hrK1mKl4XJsQwJyIeeFrZYx3Ufs5pz5f1UhrHW?= =?us-ascii?Q?YiUVlh8kAzq6tX4WUvvcApsaxh2DRQ2+m1khMzSXasjPKeVLTDcmO/5o3C7Z?= =?us-ascii?Q?jOyZSWQzxKAF2ueyzj5qs3vewKuJdrOyJqustI3KJHu3AU9bbukw6VT2cZwL?= =?us-ascii?Q?nEsj07zqOanB87E5MK6EApxLjoWLKy2nuyWmiEXNTdta0p9GIQl4GQYXDm4B?= =?us-ascii?Q?my0L9XLiZ34TgaDera1tty6dlzaio2L8XNAeFEKN94QbETffnkjiGza2C0aN?= =?us-ascii?Q?MV1ASBvYs+gDl8B4PiRp4VXh1AhgWhKpGKAvB82hs/ILkywD91+mLAKEme7Y?= =?us-ascii?Q?qG9mBXqXpdPGWS+AsDbVhxdZ+ZTKSMJJy5U6sH6N/N2hzNNG+cXEuwklDNuc?= =?us-ascii?Q?RNDWMljG2+HlHgNL0P4r02qrH3XsiJM5DNr2EtXJGvyuL7C4OBTQinNeHDR6?= =?us-ascii?Q?dORH2kjsEb43Bc=3D?= X-Microsoft-Exchange-Diagnostics: 1;AM4PR08MB2820;6:x+Sn92KnlPK32d/725D6Oc6Tr39jtqCBKcqhEmbOqV5lIvfeJiQYd/ZGLO5cotQkrvfnVbIdGMXQ1Toeo2qHi3L3LR5L8tYvhTEvvNqT74N0j0hJ43QORuJVjfuk609NTrjUmq0Gy7JQ05A3YA+B9B4jglWQYxwwTo3ltbO0a/RjrreIhrZelL1nbQhEO1HcqS1o5uAs6RXnFlQSWE30w0HLW/H8a/dJo/Z5qHYN2D3MTsrdKrsOtysA+6FW4t9ORqZcXeFJLBwFscDyiN8/u/gwiR4tXJNkivZSV5mHuk1/11JD+/2xtCdB8jlsKPgtOO2qCrEdTc/DoflvN+vEng==;5:voIiB3DXD3lz0sVztpM05P1Rzsj+Plpy2SktYd26NklpnpRPFmJys6Hidd4b/8+IWecp/ajXw8gNZF2q2Eo603TscpLDwn1Il9CzLk/1quZs0pcA9xOzbUzOmmHuNGyNYUJl3uYJjFVBMkx5X29/YA==;24:uWcWZ9/ZXLCCWcEGn5o8dsZuG1pM7RAgDvaH26vDN5mdGdazYZMBj3bPAtM0eoYRUZBnibjgRAyBy6JaimxMaKShQLIM0VWysez3+IJ/UZI=;7:o3GBBkVTnJEggaLSjiQEHEdYhGhQ/hMkA2cKvPKY2G9tPqkACjLxxQ26KoD5uzw48Wli/WsYTTt4atjtd570+TMdBaXjltrr6pJ5vfBSzE7X/W5TwbqMExg8/jJJyJ4HzGxtkX2IhzVeh0dVATIF3Gfz1HTJHX19q26JfHdXt+N5m018DrPokYvzkcxL75XdYXvlm0SbW2QQc7n9FBTgGBPsxYFXAD+nmP3FW8hKyAY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AM4PR08MB2820;20:WJb3VDtobb7v5kaLxfhM9GUqQrvJ9L4uvjkd0D/YPW3lAg5wE6uoFtmJq5PUd1cuM0EnYXR40w849R57pkVJDpYkQwTza7fE9+F5qdhAAOOUSCCRBuKfmBEgRBfR22yexDENerMNRY+VMFUzANm7BkllCsA5JgFxIP73Iv8Ng2I= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Oct 2017 16:44:28.8256 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR08MB2820 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 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 006ba625c0b8..3a18f0a091c4 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1920,8 +1920,13 @@ 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) { + unsigned long flags; + + local_irq_save(flags); + __inc_numa_state(page_zone(page), NUMA_INTERLEAVE_HIT); + local_irq_restore(flags); + } return page; } -- 2.13.6