From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751148AbdE2ND0 (ORCPT ); Mon, 29 May 2017 09:03:26 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:33961 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750913AbdE2NDY (ORCPT ); Mon, 29 May 2017 09:03:24 -0400 Authentication-Results: gmail.com; dkim=none (message not signed) header.d=none;gmail.com; dmarc=none action=none header.from=fb.com; From: Roman Gushchin To: Balbir Singh CC: Roman Gushchin , Michal Hocko , Johannes Weiner , Vladimir Davydov , , , Subject: [PATCH] mm: bump PGSTEAL*/PGSCAN*/ALLOCSTALL counters in memcg reclaim Date: Mon, 29 May 2017 14:01:41 +0100 Message-ID: <1496062901-21456-1-git-send-email-guro@fb.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [2620:10d:c092:200::1:4327] X-ClientProxiedBy: AM3PR07CA0123.eurprd07.prod.outlook.com (2603:10a6:207:7::33) To BL2PR15MB1074.namprd15.prod.outlook.com (2603:10b6:201:17::8) X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL2PR15MB1074: X-MS-Office365-Filtering-Correlation-Id: 3a9ea2f8-30d7-4c15-2247-08d4a692e655 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:BL2PR15MB1074; X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1074;3:r6An/bhbYebj8sG0ClhDPIrONehoOPyiews2QylFVlzjbbrZXEMAAaWuo8icCtpxvOZQ3JIHTsaiy7zqycysfthw8LoezAfAeNEfwjcbgKYVWHcvgEE72ulYAgSRzmN+QZqxurfUg+0yaUTTlQEd++530LwK0FO5tFIvLvMOsftUvZZrZq77bdw2gjZDgrNtRxFvQzT9P48ZS8L4twBOJEfSSiu0MNLYxKVtT/ZLHWdHZUeRrwYXVMROtrc+a6dY8DySb9rdYd3bFnei6EITDAjLz4wv44FwJqH69v+t4fipSoyCNYGfUUd9uqKlgWY4SfD4DCsVn9y+9ph/WFAtFA==;25:/4VajR8mmqpHwBvaTQchR9dTu+OrKOau0zEqRCi3z+C3gCWgK0T5pIg3ZZp/86CXlFH33V8FtX+A33jTZlff1/1u86b8VvsL0GeF+YpDnwCgAgMh9TIqoTg0jTAUaoi2ePy7iR6TJmf8R5ZdnyiICjQKYgEg0+BF0opp2uE0iVO+4ECT/FDL3cGAqljGbjaZu+0UW53QOdcF2dra6C77XN4HAVxhkWZObV3jh0cXEvjRWgdYBUxcYbCnocEoRfqHaElEsCNR0qXBSEjHe2j4NU/Dc7QNiqqinz8zT3sx49mRh8b41/hsxVDHQVFRWXJpPEFdlccgR0pM8LkdTfKr6Y1uS61ffs3EKbvTg4yVi7IPemvN1LMrwTB1KpbwrLX7y1uQi2pzXdD+NI4fgFnYRer88sE1L+/7HqmS+09YF/+HFVw6+rdEwO8fhlztYnhAoaIqC4+zZj5J9GUaHtIpx5k4H76RERLgud/IhQ3klWQ= X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1074;31:lD7HqeA00O3ySkzj3/OdtkHPeeZg8Wa2wAfoKA9GMlegvDikOJbM4cgT5X18TefNM4uJgrzT1ruxuWYEkyNk/R0NEnka4+qRt1sixI6vmdBLscEWQJxu9mZHgtm+s+N7Edyq5ncWp14uXGfQe62vSoe546ygtM0RVFDaDSuD63F5gF7TsKAn1EHSpFXOvEXxbbwQWTQta9bDxB5fF/sRG0y4cpsbVvjHdRgSAp8dtU4=;20:OERBscPIujHeH1dYiKIz0atHSuHwJLSk7NBaQ1mvWXB8pbaGztInyc79tGapXpgwaEFwYx/K5jZx9SICXiNSQwcKmPKyIOkqCfs7z80FhiPcvA5of76E+NH+m0MIKwA1CeXhA+S2IoLJ4REXqdXwaoi9McjTlGXjJFTePzHV8hgNbmMHFRcqDuvAxstaIQs3MmWT54Zq9jAuGe2oMN7qEf5GE0hzHa38EalFkRjiwq0emPAfrQC7bcAfnBUHB1RjzC0CkFMFAj5b7GZUibtP0g+44LFJUgWS4QXlF+VptTFA+oluF/jM9nRr5OIN3zRbUk4P70/anAhfB6LZkfUgF0sYB7muCMLN0YI9uvS/+QSLU1yQ/0qtzGZk+spEykwOPV8iY72UldobbSXsNzqqThXdjEq3UOa+2AfGpvGw5qiud1mvmUyORLWGvX3ImnmAx7DtZQ9mCHjmeSgUuqoMEDazB4BYZ+zmI1Ek0Zr7Nf7Z18gL693NTBwOznLdCvJj X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(67672495146484); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(6041248)(20161123564025)(20161123560025)(20161123562025)(20161123555025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148);SRVR:BL2PR15MB1074;BCL:0;PCL:0;RULEID:;SRVR:BL2PR15MB1074; X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1074;4:szXnijS+/bsHHHQEr9Z8bzitgnJ6Z/7rClvfNfgXfghsvJNBpf33MWHKneaonorHqA56141RCMVEu6bnSpBoF2omVxq4ybEY+Hyi9fqoHzET4izJf/K0STa1G7MEWcbSvKuRgswUUERc63zQ8vvm8aXnrF4GCVtjpnMfwxgAAdbVw/ixrhTP9IuY3V8qaCsheJgx4SJ4C1VAIHWhk+dnvplUcR1CXPzDycqen17mRwmYT3adzuSgoCna4eiwO5hR6TQBY9CS9+dmCT7YfgeZUu8zks/Ljxvq7vZx0gMMjbT2/sPfh+ZScTq52On6eXVTe6VhJoiEvLOQ87us2yWOALguIfK0i7mSj294pFx9blueJLqh+2bcQK72s23Vr7VrMc/93X4kXepYhyyCTFH8OyLzsqtKtzK/tM7WDez8NP3NK62EKqwdKz23p3Zilr6ya+CbBYip1EWoqw+I3UWVnUh6YNUEXViDqWjz9273zPLRY33U6ksmjNuxcDflz3rcgakhpdgfDAFj0iv/IzqUta0pQxvomfyIP/KrvR+Y3y7quojquvvJKF84nHUbFzgO0PQ6+tWSyDQu/ZgYYNwVE2fENVUEZMTTNmlvvD/4/0p2j4MiCm8WFlii+JeRcemRNBBwNYflF+0/a/IGGt6s9DMenvcPbLUqhLAnMTQpGiVfl/LR/0AVIApfgqltgFY+OW92+ysnMw1CwjwhXrdKdLqu+BEmNxiBIBCiLBfo5m2oAURBktUf+dSKuteQoPzNzzyKn2+XfrcAi9Fy0nWND3O5UHxgunny5fHU7Tgm/zPKP2UiDXk8Av2rGtrrWQV04VjvZZjj+SSe9lyOao6LrkWTtDBjkxWDCgyNTJYki2w= X-Forefront-PRVS: 0322B4EDE1 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(39450400003)(39400400002)(39410400002)(39850400002)(39840400002)(6512007)(478600001)(2906002)(1411001)(33646002)(86362001)(53936002)(189998001)(54906002)(5660300001)(6916009)(38730400002)(50466002)(4326008)(48376002)(25786009)(6666003)(36756003)(110136004)(8676002)(50986999)(6486002)(81166006)(7736002)(53416004)(42186005)(47776003)(6506006)(5003940100001)(6116002)(50226002)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:BL2PR15MB1074;H:castle.thefacebook.com;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BL2PR15MB1074;23:TLPlYkBw/DE9RSQ3HXa/ZSRqWarg80ll9lXyFo9ox?= =?us-ascii?Q?pjKn9uUqRq3k6hHM38DuLXoZoKett4rMQRM1xGWL9RP0sbMcEObZLoSBo8oo?= =?us-ascii?Q?UcKDPZoDY0g6BcbS7/wOc9ph4gGBl+CyX8e44bsWoBEFzpp6yNDaNIqt40Gt?= =?us-ascii?Q?X+HWqD9TGJyWc80CgsCcSs6B7dacExAD5AdQydu41maVSQpC57e9vEOClBuZ?= =?us-ascii?Q?If/Ki1reajun+Bb7OagSsOxoBME2yqnN7eZ6DYElt6Z6k+SYtxy7m/GkcrP8?= =?us-ascii?Q?6Xm6fhuid7obo+RF8ASaqLZp3Pk4HOAEbC5pMk3FXJPTX8S0/CZXwYkIL+eo?= =?us-ascii?Q?3MetgTQU6u3tjNzLyn3icQOz2d+HluCujB9o/Z906FzLpWtn2XXMGGdcUYyC?= =?us-ascii?Q?U2lOz3LkjOaMlhUle5HDkj2FqT8Q5eFhu5iSjdaPIdIho9+RMbccK6GmHs1N?= =?us-ascii?Q?uo+Bes427sqNpsC/NJUWdViN3k4bkK7Orqyhr8AAKaFaBPz4sAClBd9DvHSo?= =?us-ascii?Q?29ebXBglZaQHb2BP6TU+lZYJNBfLB3FFJ0mMinHPyXMjSY+O6mCrx92aPHGJ?= =?us-ascii?Q?KojzDwaH5Ll1kmT8sB9/vPtXWN8nJ/y5Nvf124cJ19MXFiHvFlXHAJK7jm2w?= =?us-ascii?Q?g6y/3582IiMKvM0sZ1GQ6b1hoKktPykXl/2qK80FLQi+HshQ1NJTIHGN9jUE?= =?us-ascii?Q?u8ho63410GaZbnH7kRMwfkuyeZAvMohsJy0n3JxoLXLC9lGVOHWjwTgzbm2W?= =?us-ascii?Q?5FbjX8Q5cWTU8STFz65bSViI1DK783b1VkC7JklJ9RqNvDFMDv9nx99tpUjA?= =?us-ascii?Q?ICcDmEQadSbjEmiMJC9ehVBvV2DMZ8+vOcbW/YtMQq2/YIb9dYukopJWtpeo?= =?us-ascii?Q?sUVV0YhRiDZk4y7vWpdMmkE3OkNEIWT6yyjaTpFqEK0cdhFPvAJ/2R9Q9Nda?= =?us-ascii?Q?l+MFex0bhjby5N6zfQqjn2+awAp9NGxDVhmyGqW2XlyOPOO8r1D33mOEOJyk?= =?us-ascii?Q?WA=3D?= X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1074;6:2nKy/dq+cQvVAYQM3EH68yFE7T8yYrySHqTx3ocalsQuGVwdrUyxCKj7PUU50fMKPQ614irCSE+WEYkUdWvIq8ujXUw78rjc41bYOsKw2dy6T1Im5nJ9l2qIJeapOBHHVSB/Xba9W3oKRWHozr0gYLSNHFS+rnRUH4EdOY6XhWS7tE6/nJRf6Kpqy9uGG07WyDoLJzvudMo/cVUq9TeHLfKGTHcFlcxoNU0tU7x+Iyl8V6WgEkeAthiQ7S6zkl9ds2jzrr6calevzL/fJLzACjQ8X1mY8+izyBfZYKkGP+ENYdGJByF7UuZqrNNa8qbMQ35hnYNCy9wZkyoWiqHX+xouoliFU55WQDtZzUKyV4z8TRJB3bC9Wc1tHm+3mM0a+7sEfwUFpsAEmNhfH9HEuQvGD5qOZ/s1MknHhcqiMosgnUn2xYB3/wx1CPZHm29gkHNFk7WZam/aaWA6lZvQgTqzD4E7/3t+UUSQ6rfEKXbARIe8KvqplZDz6aO4sCXXoOF7tSqo1zvzxfeU6GOMKA==;5:p3sJk+omwtaODrzW98gO0ZK8g0qydZ0GQrKbo3eo5EzlMZcVi6/4jhzBL+gUxpBdPTqxSt1KNORUGydEBcc9cBXVcYh0+sFzG3CcIqiLMSqhqL++r/diuFzJiEAogtc4LboNCZr8qryg6N66zEHSaA==;24:cBmvkpd8/+Bt7Sf/rOybBKpQFo4IcM9S3seL0Zqi4qYYsxNVKJtewCNnZNCTYAUwwpaxPr5EECrL60QZQvJqfigtEKw+Qo+2PvU4LPkKiQU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1074;7:E5nO32+UQJu0P52cMThe8NETeNdzFJZKKHFsXulIj16Hfkz2T8N/czpuvN/inLiBB5fyyEfbzANIFGuv2RjaGoOkxCi1P/YE8QFNeTNUjreccF3u2rU3VxSxXLvkGb5cXFILfyvqBGxQTuj1z+h62zICSCmu+xTesTeoLJt/W/zh27MAsdWjpAcjMr64/gQA5lt3/nsUZI8A/WcpXzAkuqCc15tJsLqZ74fWqJIEBRYfatEUL2BZted6h2TgXMvakuDkZMHXX36Kwjr2xhXNxb6AEM9Y88GUTriMenrA0pER5YCUqNZ/9T92GSmvMkT8KkG4tSiO1U/PX67a5o8w1g==;20:B68T5apAxLU+7AobDbtBQEeSjZ6NFMG/Uai2fORPBSBGEZO0ahmSjOC9Jz4NO8kVUOQlGUMM23p1DmceehfpBj1QLmWeCalRF/CxfQSLuyKg+QSHnQaXlChovzHkVE7qtUM+gGqDPRWQ+r2Ulud9q+CtBdhFvtYhG6qiQNZZyNA= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 May 2017 13:02:01.5709 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR15MB1074 X-OriginatorOrg: fb.com X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-05-29_09:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Historically, PGSTEAL*/PGSCAN*/ALLOCSTALL counters were used to account only for global reclaim events, memory cgroup targeted reclaim was ignored. It doesn't make sense anymore, because the whole reclaim path is designed around cgroups. Also, per-cgroup counters can exceed the corresponding global counters, what can be confusing. So, make PGSTEAL*/PGSCAN*/ALLOCSTALL counters reflect sum of any reclaim activity in the system. Signed-off-by: Roman Gushchin Cc: Balbir Singh Cc: Michal Hocko Cc: Johannes Weiner Cc: Vladimir Davydov Cc: kernel-team@fb.com Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org --- mm/vmscan.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 7c2a36b..77253b1 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1765,13 +1765,11 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec, reclaim_stat->recent_scanned[file] += nr_taken; if (current_is_kswapd()) { - if (global_reclaim(sc)) - __count_vm_events(PGSCAN_KSWAPD, nr_scanned); + __count_vm_events(PGSCAN_KSWAPD, nr_scanned); count_memcg_events(lruvec_memcg(lruvec), PGSCAN_KSWAPD, nr_scanned); } else { - if (global_reclaim(sc)) - __count_vm_events(PGSCAN_DIRECT, nr_scanned); + __count_vm_events(PGSCAN_DIRECT, nr_scanned); count_memcg_events(lruvec_memcg(lruvec), PGSCAN_DIRECT, nr_scanned); } @@ -1786,13 +1784,11 @@ shrink_inactive_list(unsigned long nr_to_scan, struct lruvec *lruvec, spin_lock_irq(&pgdat->lru_lock); if (current_is_kswapd()) { - if (global_reclaim(sc)) - __count_vm_events(PGSTEAL_KSWAPD, nr_reclaimed); + __count_vm_events(PGSTEAL_KSWAPD, nr_reclaimed); count_memcg_events(lruvec_memcg(lruvec), PGSTEAL_KSWAPD, nr_reclaimed); } else { - if (global_reclaim(sc)) - __count_vm_events(PGSTEAL_DIRECT, nr_reclaimed); + __count_vm_events(PGSTEAL_DIRECT, nr_reclaimed); count_memcg_events(lruvec_memcg(lruvec), PGSTEAL_DIRECT, nr_reclaimed); } @@ -2828,8 +2824,7 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist, retry: delayacct_freepages_start(); - if (global_reclaim(sc)) - __count_zid_vm_events(ALLOCSTALL, sc->reclaim_idx, 1); + __count_zid_vm_events(ALLOCSTALL, sc->reclaim_idx, 1); do { vmpressure_prio(sc->gfp_mask, sc->target_mem_cgroup, -- 2.7.4