From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753512AbdKMQE6 (ORCPT ); Mon, 13 Nov 2017 11:04:58 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:55196 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753209AbdKMQEz (ORCPT ); Mon, 13 Nov 2017 11:04:55 -0500 From: Roman Gushchin To: CC: Roman Gushchin , Andrew Morton , Michal Hocko , Johannes Weiner , Mike Kravetz , "Aneesh Kumar K.V" , Andrea Arcangeli , , Subject: [PATCH] mm: show stats for non-default hugepage sizes in /proc/meminfo Date: Mon, 13 Nov 2017 16:03:02 +0000 Message-ID: <20171113160302.14409-1-guro@fb.com> X-Mailer: git-send-email 2.13.6 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [2620:10d:c092:200::1:dd3e] X-ClientProxiedBy: DB6P18901CA0002.EURP189.PROD.OUTLOOK.COM (2603:10a6:4:16::12) To BL2PR15MB1075.namprd15.prod.outlook.com (2603:10b6:201:17::9) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 434ed77e-83c9-4c51-6fba-08d52ab01356 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199);SRVR:BL2PR15MB1075; X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1075;3:F/wQRjXfyKGuIM3Zfq7WuFCej/mH2wNT8tZLou8D9tCYB/w6NKtoN7Ffnti3oIpzt/w1XmNZBDz/WMTX8pjrUB50GNxlba9U1tz5OirhsdAoHsh/JS9JqtEFD0bISxZm+TOwnAZ8gK7n/DZMpHVL/LiVCoIAMu+9zoFj5gJfaXh3mnM2OENgTKQIlIcIW6/oEPEfKXo6XehG+rYZuyYxI0OjzpRWSzTKHkl2mT3U6mI5sE5tSvI0xZrSdG5Wnhn2;25:CVqZOSJed3WIRc3oJ8UM8AWc9hcjv0I+Q08YQC9C1+t4R8UYU3SpPr2NcyVxGhdGJjqE4GlBgCgjHCnBUk9mCsWzz5CkAjl47MAMZAGM5jeeIEnJDEgayo4leB3tyMG1qG3TTXaRZlnTCmdXlm5DI2rAUmbkIhf3rz6BEONsZBo7cnRazKEJphv0VHWMIQpvD+rdoZ5CX4zjNYOezmmkuCOA7/ROaIJiBgVXOLa/PptNd348X7lqZDiuxRqsAsIP2RXAvD0r4su1Oxv8L1RsYDyWY7sMkLLBvALmotzJyNbzatJa6PhFv3wlkNDW3oEtMVIWhWfpx6fnQbrLnyZrFg==;31:k/+9PBuLe5Ay6RvnmYfi/V0QhwKUqi4EgpcC/vFRAOG9jVRpdo/YcARM5awm7i/Z42CwJMfTpxTwK3ctn8rvjJkG2upancKXZnWvyGnpBzkAx/VisSbnhVCZLu1n6b5olvj/L8MSUlYHCgCzDNkizZsw2T1tLC4D98nW9pgz96QkVfIO2ft0qY8YQ7WFFI9aeowv5iUrLMUUohqJNlfQGu81bwyijhGaH7lxi5jna98= X-MS-TrafficTypeDiagnostic: BL2PR15MB1075: X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1075;20:0ewst3ze6OxZ4+scLYDrCeAqF229i8G7DYZvxh7pv1MH7emGi/H+2AjvSwDcJSsA+a2S2VaE7dbhdiCK5eN/9B/fQePNnzDZ6APBVhypRVJFP8DMdQLY+JvV97kGEmjVa7EGP7lXyZoabKM8KbunkYXN9a2hUtc4cVKRgHvQGIFzSQDfjAf2qNVoXgjntU6N+UDbCwI5rjotHkQhmPekCivSDdpCeApKO0t4DK845xcet/ySYkKIRUYqq4r1YGcZNGC3RSTaBqx2YPd77T2SRGGltJ/txvypfNPY/HGbR3vEUD1sFU2Dd9wP/IQkCZNJB5KcEYwCOH2gH5lldUY5hegs80m+DqBjYcnWnm1apwBQMYY5S8UGJlvf8Jj2NFnG9trRELVeV1xvjNLKyVYPwhpUWFlBriuTlYyK2+P77YnYsfryKAP3mYmm3N0bZG9P99s7qPgfImwc/9upC2bnj3BQ+cPCr5wlAfWLRT4ynnO7i14IBy9oase4gsEQA+9F;4:xyHlt0AeJM0NlKpR4ii/UyqDO+jBtTGekwHw6XadrWHV5RxDwWHYQohbvODk55FASbYO+cYkt+/9xT0gthVGtrRaHS4JMjhRjYQDOwe4dBWKl/knjgt2ZpAN8R5CsaS4fdNB93J7NZ+jSWfq+q81LreFspdZ4Z/x96REX0OLdBYj3KGRMj4/cTkmZD/Wdopn26Sxpe4OSqBkOnrNIQ9rN5v8dG46VMiNnrWBolrKHlalDvIOwwpXPO3L/XcQV6+C1Z1OXoUhNdvtHh/X/lMnW1WPvf5Xr3+r+QTZRz7jhKrxg3UkdPPblxhse8153bKgHbUoXI8rgRsQgoOs/1/OLc3i3Ql2G/byTMIukdQ27Hjv0GL0R8rTovFu8m1SPSu4T7HOm+P6CFngh3eKyH7k8C4Ztl5zZX7kfwid+byqZ+o= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(67672495146484)(104084551191319)(146099531331640); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(11241501159)(6040450)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(93006095)(93001095)(3002001)(10201501046)(3231022)(6041248)(20161123564025)(20161123562025)(20161123558100)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:BL2PR15MB1075;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:BL2PR15MB1075; X-Forefront-PRVS: 0490BBA1F0 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(376002)(346002)(199003)(189002)(2361001)(5003940100001)(478600001)(106356001)(6506006)(4326008)(47776003)(1076002)(2906002)(105586002)(2351001)(6512007)(33646002)(6666003)(6116002)(6916009)(53416004)(101416001)(189998001)(68736007)(53936002)(6486002)(50986999)(50466002)(69596002)(97736004)(86362001)(54906003)(81166006)(50226002)(5660300001)(16586007)(316002)(81156014)(305945005)(8676002)(7736002)(36756003)(8936002)(25786009)(48376002)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:BL2PR15MB1075;H:castle.thefacebook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BL2PR15MB1075;23:RcHgSaMs68gJpGSGHmn67CGnpfjR8nPsIymF1vGQo?= =?us-ascii?Q?g5SmV/1S2pTcwA9fRUyMHo3h5PbzcMgnr6FtsaYImsswFu2huZKgpXxeGjTB?= =?us-ascii?Q?ZfNS4a0WQJUw96R1jaz5oSOWs6ITst+fhRPbNkHHhQq8E0gWDZACNRzpUsU4?= =?us-ascii?Q?4pSuth5iGqJQe4WaspSz3DneIwL6SXT3SGK9ydMmAlm6sCdwKEwmnxWVdeQt?= =?us-ascii?Q?nA3WlD3Jg4Im/mrA8aBkRYZ3zjLb3S9/cTXnRUWkcUEcqSvjI0Zn5hK7wc81?= =?us-ascii?Q?L4BtH/p4P1uhFZJ5QHg2OJMiT1mxQIP+Y8xnG8cAQFGmpCpxEs/Ef43olKTH?= =?us-ascii?Q?BUu95YIhY7/5k9z52/tcycrYxS4XdtytUBOF4I0PdP6Cypt5YVZkZYTOE8se?= =?us-ascii?Q?0/M/8y6t0rHLFf7w7zqPmSPKC4FM+rRDrUTgE8u330uFCbPr+NCO/N8jjnHU?= =?us-ascii?Q?gGE6XpPqWSrDi9zkx14e6jrSUVmK1DVXk6DrjeBmuhEsc9N7upLCh3WUhe8X?= =?us-ascii?Q?vIZlqEPZJjUU0bxcMekq2rCeTE0knzBznA5uvSFeOLsb3hKvy9Cw2pzuh2vv?= =?us-ascii?Q?60L6mBRwO2+uT7Io7SQszwHqqvXkD27oJl/TgvdhZ45BWxWGPEmL9WRWwFYA?= =?us-ascii?Q?WXPnkCa4fE9Prbz9ziihDQGS2kA5EGgM4T6RL+K3KV8/i6yi4JcMMMaBV5bV?= =?us-ascii?Q?S/hUIP+fC5ulIQIaTUnmLidcDGpoZXfwMmmty/wN2+M8x9r/K5Eb5P2LN6oD?= =?us-ascii?Q?VOtMtY3Vw/KRxD1VIJpO/0LbtJR+fu8YtbJrIJa40NQ0+Q9v2KboZ8QBGAc+?= =?us-ascii?Q?JF+/eBO5JKecu+Zc9DDDIkp2aWR6wQ/+CTCdqxHfNsNAzDttgqvVGekSNhpm?= =?us-ascii?Q?eqTpNvzF29C5PRLGeoYASxaz75qlLzrbctwNo9iauHOE4ynNO9JdE3l8rehb?= =?us-ascii?Q?UDxGglTft0tXUWBcylUArHNNbwDp+pG6ZxOIApnK9RCsMHhkndCLCF/WFttv?= =?us-ascii?Q?E5bYsH+8JoIbCmB+cBnc9wf5Tv9ANVBJBNzCBvCHJZ7R6lLs0yvV/CT4ypOt?= =?us-ascii?Q?Jm593NKTFvwP6UPEa8QZD5GPbjxr50aSsyXVSZJcPc1CmPkpw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1075;6:DuQ4Voh3eMZBgqvEpPoOwtEFKe2h0t/HmJ49Stg2Gf1IPXXYN3/4hvHgB7iR+Q44HXRcwZHbFDdArzKUmFkOlGNjGol8Ci5aCNssaqI+VF3p5pbHCipnfPJJ135xyvmd/JpJNijLQyRZ8UuaxuJhNKIqoNuCVZ3B4Q1q8lJbrLq0Hd9a4e4sqgPc7FASSVuDvKq87i6QIhwk1gfFEnYlEqJqfZJ7wMi2nt8PBQoXrYAMnnPyxEWvFKebe3lt9svnqiyDYs/vBAwrNDnPr2GXyelIlCUsTooxJyO8hrjbhj2Tbzv4uOGTnTaf38Bgv9IGePN+9gZ1bZv2wx7x1xiKO7OMAg31wHtrkEohvZZQKT8=;5:5Kikc3qcsc4U2H/ZRR2gumqqrXjL0KeFRnM/LWtbZH/krlWjCCq02YhO/LGoaleDbJ9qu4wImnHRsum0wsLpvQQ/+Zx8zOHe/F06qaVHAN7v5LGeFhOrdV7l9Lt5W36rBwU4PYKOxOhabF6tdQjcsNXKr/5YNwsJdnD2B0nfo5c=;24:6GnemZjvx7Qu9jFLmDBTN2lDp06FliFIFWWc9bEZ/xWazvVIUZnqZxY8NtiO4ylFJRrTausCFe6ZwzmjrsfExYSJL60vH4ptAsnhIKGPwNI=;7:QYfjk6X8YIeaLjHDOXxU7do8nPL0U0NTsgSO370U40VbIOWpS+LKZBH2ra0L6i1tBIuVJODspN6vcHVJMXNuzWvlg95P72/juIrSagsV96IzYo9mYr9YqYZQwhRIZu6lwDOlTWAkQn+Qlag9eXm4gjHDirgf9urJHmlmeYlMomD6MUSqw/kYRZZPz82Yx6kG6bSMzGePKIA9T+Tk7/JVrzWnoqnoWc1R04eV7f/9axsYRnXP/b+WPbuKdizpMBgb SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1075;20:e33000AHGeq2fYcUMdV0mR0zp4S86EzUjKBlmJ3hlpZrHqxvgswmw7Gf3N7PeGC0PnZxs0iD4Oi9Kt459+5/Tr3UWfTH4jAX0JuRL4L3P5cgsYkwI0QyyApKFZs0agxbwZevw9pIqzMwcoDbQaoUv+sKssj9OYsdYsU9OdatIxc= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Nov 2017 16:03:25.7178 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 434ed77e-83c9-4c51-6fba-08d52ab01356 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR15MB1075 X-OriginatorOrg: fb.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-11-13_08:,, signatures=0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently we display some hugepage statistics (total, free, etc) in /proc/meminfo, but only for default hugepage size (e.g. 2Mb). If hugepages of different sizes are used (like 2Mb and 1Gb on x86-64), /proc/meminfo output can be confusing, as non-default sized hugepages are not reflected at all, and there are no signs that they are existing and consuming system memory. To solve this problem, let's display stats for all hugepage sizes. To provide the backward compatibility let's save the existing format for the default size, and add a prefix (e.g. 1G_) for non-default sizes. For example (100 2Mb pages and 2 1Gb pages are pre-allocated): $ cat /proc/meminfo MemTotal: 8168976 kB MemFree: 5664792 kB <...> CmaFree: 0 kB HugePages_1G_Total: 2 HugePages_1G_Free: 2 HugePages_1G_Rsvd: 0 HugePages_1G_Surp: 0 Hugepagesize_1G: 1048576 kB HugePages_Total: 100 HugePages_Free: 100 HugePages_Rsvd: 0 HugePages_Surp: 0 Hugepagesize: 2048 kB DirectMap4k: 30584 kB DirectMap2M: 3115008 kB DirectMap1G: 7340032 kB Signed-off-by: Roman Gushchin Cc: Andrew Morton Cc: Michal Hocko Cc: Johannes Weiner Cc: Mike Kravetz Cc: "Aneesh Kumar K.V" Cc: Andrea Arcangeli Cc: kernel-team@fb.com Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org --- mm/hugetlb.c | 49 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 4b3bbd2980bb..abd37999f5da 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2973,20 +2973,45 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write, void hugetlb_report_meminfo(struct seq_file *m) { - struct hstate *h = &default_hstate; + struct hstate *h; + if (!hugepages_supported()) return; - seq_printf(m, - "HugePages_Total: %5lu\n" - "HugePages_Free: %5lu\n" - "HugePages_Rsvd: %5lu\n" - "HugePages_Surp: %5lu\n" - "Hugepagesize: %8lu kB\n", - h->nr_huge_pages, - h->free_huge_pages, - h->resv_huge_pages, - h->surplus_huge_pages, - 1UL << (huge_page_order(h) + PAGE_SHIFT - 10)); + + for_each_hstate(h) { + char prefix[16] = ""; + + if (h != &default_hstate) { + unsigned int order = huge_page_order(h) + PAGE_SHIFT; + char suffix = '_'; + + if (order >= 30) { + order -= 30; + suffix = 'G'; + } else if (order >= 20) { + order -= 20; + suffix = 'M'; + } else if (order >= 10) { + order -= 10; + suffix = 'k'; + } + + snprintf(prefix, sizeof(prefix), "_%lu%c", + 1UL << order, suffix); + } + + seq_printf(m, + "HugePages%s_Total: %5lu\n" + "HugePages%s_Free: %5lu\n" + "HugePages%s_Rsvd: %5lu\n" + "HugePages%s_Surp: %5lu\n" + "Hugepagesize%s: %8lu kB\n", + prefix, h->nr_huge_pages, + prefix, h->free_huge_pages, + prefix, h->resv_huge_pages, + prefix, h->surplus_huge_pages, + prefix, 1UL << (huge_page_order(h) + PAGE_SHIFT - 10)); + } } int hugetlb_report_node_meminfo(int nid, char *buf) -- 2.13.6