From patchwork Mon Aug 14 20:00:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugh Dickins X-Patchwork-Id: 13353212 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0DC9BEB64DD for ; Mon, 14 Aug 2023 20:00:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 885EC8E000B; Mon, 14 Aug 2023 16:00:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 837308E0001; Mon, 14 Aug 2023 16:00:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6FE668E000B; Mon, 14 Aug 2023 16:00:23 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 61D138E0001 for ; Mon, 14 Aug 2023 16:00:23 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 2AEB5A0C6B for ; Mon, 14 Aug 2023 20:00:23 +0000 (UTC) X-FDA: 81123777126.04.7EB7053 Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by imf17.hostedemail.com (Postfix) with ESMTP id 423B140013 for ; Mon, 14 Aug 2023 20:00:20 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=RN6gKeP4; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf17.hostedemail.com: domain of hughd@google.com designates 209.85.167.179 as permitted sender) smtp.mailfrom=hughd@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692043221; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=fLQ0206Zcpd3i8+yXJ7CFiqIkxqP939o39iR3izE8t8=; b=vh1J/H9JTLaCbM7eqTwLj73tVkrVVPOfcoJ7lOd7AclKsKHDzf79ydyIO2MAEJu1yXBjqq 93O1OIe7zhqOraclggzWrkr8NdCexTo6evSVcLAncOs6vx62XF9kKgYLUgJneEcoA8vFOs vE2vW6Y1g0mJEr8EBw8c6BJWkADagmw= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=RN6gKeP4; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf17.hostedemail.com: domain of hughd@google.com designates 209.85.167.179 as permitted sender) smtp.mailfrom=hughd@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692043221; a=rsa-sha256; cv=none; b=aJkRPjmwvSNcGmqUeDL7+S9paWsyNgN+htNzD4kIhehvY3GDM/oXj1mPbmlQvZiq0PsoKL xZB+YxRoEFtHfli57uBiMxbcbor6aLFIFHgtmGM0oNJPkMQP+avQA9DCKhFig7AnqAzy0f ny6XyQgsfLaSIJpEJOCacmWeydbTbg0= Received: by mail-oi1-f179.google.com with SMTP id 5614622812f47-3a5ad44dc5aso4015327b6e.3 for ; Mon, 14 Aug 2023 13:00:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1692043220; x=1692648020; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=fLQ0206Zcpd3i8+yXJ7CFiqIkxqP939o39iR3izE8t8=; b=RN6gKeP4w0087rNnMmVXoFM/DcIMZ/YmnKoXkr5SJzfx1iO8cyco+ZvTGjP5PepIvl NFXvArAkgErGReP7S709cnpJnbjN1LCrnj418QbDowzRZXihJGTIywKqUEEuLUJkbAHB JxGP0RNZYILzDXKIHx6DAaGKJ7xu1zOAwZP/70PV+AoSBiiTzvW8oDMc3Oeeipvs3ue/ 2rOmUeY4BIWB0qk/lafxbeh90LWhsKOrhbthbNkkNbtWxZxKI2eapY8l5KqM1LQc294f ASD67WhSSFXPWZNAgoVMImYvFEJq1XK8idKtyHJJ14gQr7Wn3L07eyhbbIOdoWZh59zq aZZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692043220; x=1692648020; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fLQ0206Zcpd3i8+yXJ7CFiqIkxqP939o39iR3izE8t8=; b=c8q5Y/JwCxqS0Ln4TBp+gho5XEKYYYwZgcVADQgUL3eKbCWPVBCaqdqX645yLatUSO H8kH9sU09zTxU1qYtHqpxJM5GUzs/skAnrYFPZXulFXijnY6g06EqZ8T9XU9Kgcdxa0A CHzfHK3e1qF6FFwKGxI9T4adR/SN/bAdGWVipicif3vq+Wa5qiSxbcM80ROjQkGDos9m xVZR3dez2YTIdThUm7dk/jTeVThFtmbftOFQOrCi77zhZB0bdx5Cfq3xnD98N1V7KMOe bCeqcTglocPQIjDp/MovT+v4g+yNgLFzjRuO0E3NAR0mmjQ9MaUcMW96FoDtH1kAqcfu r1kw== X-Gm-Message-State: AOJu0YxNva3kwdAElTP1TL2fFrpU8RTCulH6Aia9VUOu6UvTB40+CAy5 U5kDD4reOr3U6wcPOhxHxPrLqw== X-Google-Smtp-Source: AGHT+IEOQJ+jfWN4KtURoiQYtB2tss2wLUdB8eRtQxajAzs5pelAep0/lPLMEJvwccdyM+zv8eNYEA== X-Received: by 2002:a05:6870:64ac:b0:1b7:2d92:58d6 with SMTP id cz44-20020a05687064ac00b001b72d9258d6mr11323701oab.32.1692043220095; Mon, 14 Aug 2023 13:00:20 -0700 (PDT) Received: from ripple.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id s10-20020a81770a000000b005845e6f9b50sm2965735ywc.113.2023.08.14.13.00.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Aug 2023 13:00:19 -0700 (PDT) Date: Mon, 14 Aug 2023 13:00:18 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.attlocal.net To: Andrew Morton cc: Alexey Dobriyan , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 1/3] mm,thp: no space after colon in Mem-Info fields In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: a1qr5tymnhmc9gsdhpo1qmi89ypxc6eq X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 423B140013 X-HE-Tag: 1692043220-334178 X-HE-Meta: U2FsdGVkX19VNwGXgRBiic+q6PE4NPGKUoOYykGdjkyA4nks3xgEmsx2gvwcbZJL86Wd8K1jNuot6IH36PMs1ZXiFK9SXxFQB15oxHyJDgmnqFWEL8SPwl6jUl4MTz4uJMTPGu8uXY7O6fA6TEH9VxLkM8x+Ic357C5utm+Cuh3GIa7sDZkgf7u/dPGyi5MhP0nqr8UDcozeim/rJxfoboiCF5wQoVKJR8NSEBfCvY2Vq5Ax8Git92qxO3gCRerpqMENCv6u9oRSK4ssk6zkAoaeYQp9zxklFVCZYSyOL4o+FEAxHsl06VpH1mFMI5gnuWSj2VOomZ/zCTzFHO67xRWx4j9ZBWlTJaHlcIqPX97Ja1OULlqdze+klR4IOolVRiJzBk1xG6KiVgcvR30p/G7ZUUYN89R+usNsNJYC5aSD9cDiKB7WK4t9QDGIBUCwHOmeyvWHWkZfIc5HVzEwgfeFG7RiQkjOgfQb0mJYQCHKwZl0bCYK4zopcYfTzhmJoSWyz1WNhOVm82gC5vD+GnfxW4YworDnn4YwA0d9KQzkCUDz0DQY8EAfKeKkI3u1wpgzEXuAL85rn5SzZyPZL/nrahags3ouffbkf1M8JnK9EgpMroGYpjtWgRC8q2ZQsdDIap7PWZbiS1jROGuJC8ldq0G9hJs/CFZZV7Mkx0BXq7JxYb6dOR97+Z3MB5MztaCvhBUmN3219xnIw0uYZmiRr5Tnn8y6buk9lvbNMoujG5n3KwkGbdXLowZJF0l+g/QE13UJ0Vy7Bi+cdjG4hrI6VnDdAfNkB5fq4xK9BFxE9CbXERsn7lsUuNsgDEan/IvfohfxEvRV8jePjQ2W01Ms4R1WxizrJkF19KogmILJNC2rTDJWB0L9HaJC3AbX+mA7vzAdE3z3668bQv1MGLXaJkFJiABDwDRDgaxOUw2zAkQDtubGFYh/N/beGjXw+k4ELbQYh9ssozFEw6/ JsXTjH1a AYLYYXZTBuBJit7y96KQ2mwwj7o4W/IDY5qwU+fwpWGy3F7SAC1fFtUyPhBq9QdcbKAOXJygDw49xWuc9BPGwnQKSN6jL+r7ARd1Rw+sJ/wH4fWaEi3so3LLvgUWxt3C1DEOS23UvO8gEzY/KNpEWdoJ3X9/qXDJuMPU3QXSQ5yqo29xo6lH+yya2UdEqV3xMQbkrUTUwO6cNWzrOpsCjkyhzfGU0zpqAACbn+9JacP3P70Ko6tA0hbx22NGGbbeDlwtStxEGI99INZsTQSzT3O1n37h1j6FmlSjsdYR6EsPB1rrJlVvT80k6ljJf93CI/jSqpLnFQL1dYunCYsmmKiuqu4TJL3WA/PU2YfExpGerE+N6gzQJu0i2A1gij/6BC/ph 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: The SysRq-m or OOM Mem-Info dmesg showed (long lines containing) ... shmem:NkB shmem_thp: NkB shmem_pmdmapped: NkB anon_thp: NkB ... Delete the space after the colon after shmem_thp, shmem_pmdmapped, anon_thp: as the shmem example shows, no other fields have a space after the colon in this output. Signed-off-by: Hugh Dickins Reviewed-by: David Hildenbrand --- mm/show_mem.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/show_mem.c b/mm/show_mem.c index 09c7d036d49e..4b888b18bdde 100644 --- a/mm/show_mem.c +++ b/mm/show_mem.c @@ -251,9 +251,9 @@ static void show_free_areas(unsigned int filter, nodemask_t *nodemask, int max_z " writeback:%lukB" " shmem:%lukB" #ifdef CONFIG_TRANSPARENT_HUGEPAGE - " shmem_thp: %lukB" - " shmem_pmdmapped: %lukB" - " anon_thp: %lukB" + " shmem_thp:%lukB" + " shmem_pmdmapped:%lukB" + " anon_thp:%lukB" #endif " writeback_tmp:%lukB" " kernel_stack:%lukB" From patchwork Mon Aug 14 20:01:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugh Dickins X-Patchwork-Id: 13353213 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65847C001B0 for ; Mon, 14 Aug 2023 20:01:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EA1848E000C; Mon, 14 Aug 2023 16:01:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E2B018E0001; Mon, 14 Aug 2023 16:01:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C2F418E000C; Mon, 14 Aug 2023 16:01:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id ABA4B8E0001 for ; Mon, 14 Aug 2023 16:01:18 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id E3723C08EC for ; Mon, 14 Aug 2023 20:01:17 +0000 (UTC) X-FDA: 81123779394.14.5057705 Received: from mail-oa1-f54.google.com (mail-oa1-f54.google.com [209.85.160.54]) by imf18.hostedemail.com (Postfix) with ESMTP id 29CA21C0034 for ; Mon, 14 Aug 2023 20:01:14 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b="4RoK/TMu"; spf=pass (imf18.hostedemail.com: domain of hughd@google.com designates 209.85.160.54 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692043275; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=PLx81HjNMcdtjBPAf501FIttTYshdXsh2VkIYyL/jUk=; b=0s8h8LEKqsdZM5wrSVUersyS2Bq9odSsFi+R1OJsgM3VIVEDMN55L7NlZYlR3idW0cM3LR qKCxDL5ynb/6sr/mrmXf54ctlzbxqcCIETPKumpraw+vLJp/pPC+N5dStBZToRkd6whyaG pvQJYwohoun3+NIeyAnzxvKnhQ00c6E= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b="4RoK/TMu"; spf=pass (imf18.hostedemail.com: domain of hughd@google.com designates 209.85.160.54 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692043275; a=rsa-sha256; cv=none; b=8UR41RvUc6ZrjhcE8u7szglDw5mLPHKIGLk0NRfTbNw950dZZdT3bgxLhSlutjj/HfFocu /BBAdiJrw3+EjnBoezr6HEw8qd7aGeOHwm8HkdLHqZf+xPJWyy9MYo37WjM4FEM4G5N5eF EZv/GSbr6G/PFFFrdryVZB110c0iMOM= Received: by mail-oa1-f54.google.com with SMTP id 586e51a60fabf-1a1fa977667so3691886fac.1 for ; Mon, 14 Aug 2023 13:01:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1692043274; x=1692648074; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=PLx81HjNMcdtjBPAf501FIttTYshdXsh2VkIYyL/jUk=; b=4RoK/TMueeUlc/+s9Wek0k+/0CReAWcvMe0a4D5ry8OTkcRIgoMFS8dfWNnovi+FtR aJsfh9FwCR6j5RC19LnxdYiuTwFPA9pGlH+NJafKbwqmH7Kjhc623dr+IBKRmesHMsqf VX6gFd1D6D3rmlQuoOZUP6jSw6QGNv5W7M2kyjvQ0PbXuJJKCDM3Dc3zeVQal+DomuHr ODih3LQ911QDnFCxbyzjK7K53OHt7TyrTe+TekyFUl1l0tkiwET7UVSvkUiGx/Pt7jif KQX/pdi4bt9vWNJ4Ub7KdNvxXfAUUzLa2F08+YErUqc5iQxfwTByG+Oy1oTg39KZW/PI 3Eog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692043274; x=1692648074; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PLx81HjNMcdtjBPAf501FIttTYshdXsh2VkIYyL/jUk=; b=Idc9WhUr3gp9G+l5gbXkEpd7tJ3FZOKbqxbb8zmJL9QgHlVzPm3FTB4tdnfJLw9Py9 HLqKPIg3fDzaCejdOl/lT+bfZ3ES/PuiyamNiEUOD3PI5sZixfOh4mlnfZuIwHFBpUsO TeZB0dSfM+UPLbLjG10lS8eJJHUBbKMvNFp664TH1+LvhGkxrpv1x72YoWwoDOGObIR0 IW+YbyM/IjOCH6v8rMd/2zTdp5bcvoJp9Oht6Yk31gyO9Atfb19qkfIK9iRSfEpjKh32 uHt+uPbdz4jn2hHfwloTjn206s/WYzX7CpZdI7Nn8dfb/C/iXTr2BSjlOzkYVlCZ6Gkv pdaA== X-Gm-Message-State: AOJu0YxENPFJpQOBCcutcBDNoFzfZxqwkp0pe/XC/DVEjhoXwSF76JEb U4IA3DAKzjHQ35sql89JnxRLLw== X-Google-Smtp-Source: AGHT+IHJsw2JK75MRC3bpiMwlKdGt/SDygzWF4moEUm3RhHfFPnMbvc6mpdlGUzicghlzenU7k4mkQ== X-Received: by 2002:a05:6870:971f:b0:1bb:b337:fdc7 with SMTP id n31-20020a056870971f00b001bbb337fdc7mr11678733oaq.59.1692043274049; Mon, 14 Aug 2023 13:01:14 -0700 (PDT) Received: from ripple.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id y6-20020a818806000000b0057736c436f1sm2961902ywf.141.2023.08.14.13.01.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Aug 2023 13:01:13 -0700 (PDT) Date: Mon, 14 Aug 2023 13:01:12 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.attlocal.net To: Andrew Morton cc: Alexey Dobriyan , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 2/3] mm,thp: fix nodeN/meminfo output alignment In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 29CA21C0034 X-Rspam-User: X-Stat-Signature: wynfpe8gkc6z6qw4iox34o8c1szofpgj X-Rspamd-Server: rspam01 X-HE-Tag: 1692043274-769638 X-HE-Meta: U2FsdGVkX19FDLwcYSDAvRXLTwPL1jRN0Wfs9ku5Gra3G6uiUsy9QRS+CBgfGUPEO95sROLetiCQevE0+937HtsRf03EO0ba0aN7Nf875S9p6bIBYeir3/EBxviKFDo5WNc3wsCTRVNxdnb/9vtOmSlhk2hSrLo7a3ns1IzEVSZ3OzW0G0UNDJIdn+WtzwEc0jRFC4H/aEWWaEt1/To0sJCuyONpRYjYncK4x2SkrAJZ6NuaznxuKZmzTVlFOSXa2AKLZ2+c3eiBf201jTk6Cyz7kCu8HWCHrXbtzBntFN/b336Mh7G/ELvWQGRw5uBdHXfBBWjXjREImgjeYlNFJyIFO4UrN5FIb5cjICTExd/GsRBn+MTIjBMu0kLhHhHIZZtvsx1exPY+YWQjW4n1GYHMLaa/f9BpWW/7I0uhT4agrAMqrnHOc44d/OXZaWfSuiGILsK8LhufS/9F0IluoGFTq0SYdIQmWyDA/N2dkCZfeqp7Qf8fOdgX3Y0kh5nSF7RVRtU4gQy+GduRR8Tn/9v50wBOWjGCGn67A55zO3kpyE0CvMWl7+49vJkVQZE1J5iyWuPvkwxwHjJyAU8gzItioVAv2A0jUsNQC1jup8yqiqbeP/n0PhmkYGy3thE/ODGWkqXHYDz4M1P4bGxN1hYYZCkZy1fKMAEBcHHfZVLMsM4QJFFOH1CNTN6+AbLVMm4FGvXpGx85FaUw4gOrKz9OtJq128PDSLv5R0kuaZVDQYgDPQ8hbChgKjIDg6v10q9TIcdFcLqOIU/1/lAqr2vYfzWwv2B+I6bpkRUHBMcjeddS0aT8XvxxZSW9VimZpWujj4/0VB3O/i39FZHwwChTqCR4f+1d8ILTKqL5jvYqMM0dk05dMKu7YH/lX0cGuqNZDJ7JE/XXPC9YxK0MN3g9Q57Nz0rUHPQgOqPgUTU3PpvN5OQb800ajONhJLsjrSXD8xzZNzTvkwlUfhg B0drCnEf 3G2N0DthKtsjYJskZVUnF5Ljt7IYyhAwHOw6JAN0mR2F0vbfBz0GE/z8Xg3U6BmfXlTmq90MjlHnKh28i4ydgcjEHi0ZO3ALWMYe4qpB8+7PdHI1xYU02ZwwjmMVu0Gj1KiLSQxn11wZXYlw9DpUx0qwr+wCRbz1w3HEJ5/C7O4r8r3xh+i3g9gdgKM7e7nUJXHR9+X72KhFHye5B6EJhXUU6Sn/3ocOVLs9Pka6IpvKhawqODWomZ1dJrEoEWkgXyhSeHAtz0VssQ7rEgL0ne2utwkT2Nu4QuD7fWNftHKjeGQoGitkq6sHYqA/ZoV+3gHLWJZup/ilhiGWx3l2oQJT8orRog9Vai5i5GoCpsvFVrdp6UylimPnHrncxx4dfoC6P 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: Add one more space to FileHugePages and FilePmdMapped, so the output is aligned with other rows in /sys/devices/system/node/nodeN/meminfo. Signed-off-by: Hugh Dickins Reviewed-by: David Hildenbrand --- drivers/base/node.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/base/node.c b/drivers/base/node.c index 9de524e56307..8e871ba9162f 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -446,8 +446,8 @@ static ssize_t node_read_meminfo(struct device *dev, "Node %d AnonHugePages: %8lu kB\n" "Node %d ShmemHugePages: %8lu kB\n" "Node %d ShmemPmdMapped: %8lu kB\n" - "Node %d FileHugePages: %8lu kB\n" - "Node %d FilePmdMapped: %8lu kB\n" + "Node %d FileHugePages: %8lu kB\n" + "Node %d FilePmdMapped: %8lu kB\n" #endif #ifdef CONFIG_UNACCEPTED_MEMORY "Node %d Unaccepted: %8lu kB\n" From patchwork Mon Aug 14 20:02:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hugh Dickins X-Patchwork-Id: 13353214 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 422A0EB64DD for ; Mon, 14 Aug 2023 20:02:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B476F8E000D; Mon, 14 Aug 2023 16:02:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ACFAA8E0001; Mon, 14 Aug 2023 16:02:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 970838E000D; Mon, 14 Aug 2023 16:02:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 7E8EA8E0001 for ; Mon, 14 Aug 2023 16:02:15 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 330FC804F8 for ; Mon, 14 Aug 2023 20:02:15 +0000 (UTC) X-FDA: 81123781830.07.3D3A197 Received: from mail-oa1-f48.google.com (mail-oa1-f48.google.com [209.85.160.48]) by imf17.hostedemail.com (Postfix) with ESMTP id 26D1A40026 for ; Mon, 14 Aug 2023 20:02:11 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=lDXYOI3e; spf=pass (imf17.hostedemail.com: domain of hughd@google.com designates 209.85.160.48 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692043332; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=vfRGFHRblVYm9a4Zjcxv2SCcEUrJ5g3lq6KKqWpPSec=; b=6nxzeMYi/azQ71xaab7sg67zGfz7KSNxyxd9+V2x1zhA1vm30LnFn1L/8LB4FJci3F7AWr fa0q8OTYWBRhLufKs/KW+Y7cn4LVkKOiPC7ZKqWDbaEa4zwcl/JMbpAHd1Y2izzQjIXg+n eg9rjbcWwh2ebKWfLHTL+LQf86UuDao= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692043332; a=rsa-sha256; cv=none; b=3m0imDxPC4rob7pFTHV259tOzp7WGpzzCULcW97wOyhJZ409DqC/r53vP8WzMWPIDS1jhm EIo+8xqjrohaRWvvpBy0PtylVU0lb41j6O1igCCDYMo02wwyUPwoy1cokNrd/jcaO1hFCp K2CfUrP7Qo49nKoHLcX9G3qPkKMer0E= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=lDXYOI3e; spf=pass (imf17.hostedemail.com: domain of hughd@google.com designates 209.85.160.48 as permitted sender) smtp.mailfrom=hughd@google.com; dmarc=pass (policy=reject) header.from=google.com Received: by mail-oa1-f48.google.com with SMTP id 586e51a60fabf-1c0fcbf7ae4so3252813fac.0 for ; Mon, 14 Aug 2023 13:02:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1692043331; x=1692648131; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:from:to:cc:subject:date:message-id:reply-to; bh=vfRGFHRblVYm9a4Zjcxv2SCcEUrJ5g3lq6KKqWpPSec=; b=lDXYOI3eqyv2pAGd9fdn+sbA7tEtD1U4ZnyxWf5DmxG+/pG4TaMd9si5JjxV+Y4elW QvgOMxk3NY7c9BnKG22wjYy//1uPNmxeNb9pDlpqRqy8cAieAlY5mIjfXRi0Ut1Uh+1w 5JQrpwcdY/7Ev4qoTy7WGyScS8UOWj9apJda3pbd2KkeO9zP9CVQjFBL+VzITKto60yk hhbdoUn7Vej+ExjmddY71eQ1JeHAyKipqNoT8sPuvBZDTfZFFRj/scEnEu4uRwc4Mr3l 5gGyuCkGmIkee0EzLlxak+SxDLmi+DKJZMjYb1+hi2RfaiKUGgHwYojlM/stqeS1ZaXD kSBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692043331; x=1692648131; h=mime-version:references:message-id:in-reply-to:subject:cc:to:from :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vfRGFHRblVYm9a4Zjcxv2SCcEUrJ5g3lq6KKqWpPSec=; b=c9ZCpGiYfYd6ABWJNUVJ81Vu6uxCe0+8rTud+vFxgvJJs/lfn8Wc7It9Twx0w1ladK iaRtkYueNqc6Cm48HsoVupQqDdljVoPGmG01qy7g7ImlFH0z2t74FZ3sZXCCoSTIPa0e u/Ge/Ce5IRgwl1culdmPjSZCpJzbFUPoRZAgifK4qTohfP82FjnSD/D6L68UPAPaIcOR /8jeOf6AeUMp+ROVqkan/7meWOKLXu4xah9aFQS+kZemyE0UXqLmh9XMg2TTqpN9AII3 s+mUPr3XKajXsBm0Od1iSu6+kxl6BD5DEOsOlysrI7rzhebRXwGawttHhBFvxRcFyRrK PUIQ== X-Gm-Message-State: AOJu0Yxbmd3PKMwtOZMI1jtPO1/ox+bujt50f4NibF3KDismFQKfRCeS 2GjwLRQkOXCNITjjahLD0oiWCVbdIxbD+6HD7dxCJg== X-Google-Smtp-Source: AGHT+IHC+0qdqxsysM02okguYcvI1jvs0bLxTCBtuuiFTVTXL1MJdj93jH7snfqXUjweHqeLCIdazQ== X-Received: by 2002:a05:6870:e990:b0:1bb:8483:a807 with SMTP id r16-20020a056870e99000b001bb8483a807mr11104238oao.44.1692043330522; Mon, 14 Aug 2023 13:02:10 -0700 (PDT) Received: from ripple.attlocal.net (172-10-233-147.lightspeed.sntcca.sbcglobal.net. [172.10.233.147]) by smtp.gmail.com with ESMTPSA id d63-20020a0df442000000b0057042405e2csm2970168ywf.71.2023.08.14.13.02.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Aug 2023 13:02:10 -0700 (PDT) Date: Mon, 14 Aug 2023 13:02:08 -0700 (PDT) From: Hugh Dickins X-X-Sender: hugh@ripple.attlocal.net To: Andrew Morton cc: Alexey Dobriyan , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 3/3] mm,thp: fix smaps THPeligible output alignment In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 26D1A40026 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 7n5z7xk3zyt57wp4xhx9ndr3zgryk6ky X-HE-Tag: 1692043331-536531 X-HE-Meta: U2FsdGVkX1/IcBiJapKYrPw3Cf3QpTFEqMKigDvy+16aCdSbvRJBPp6EgUMii4UMLIDKVZ6HAQZ5OJxtcm/dTMtyAbyke8ZB+9CPamzY7z/sDVe+rxmEzOur4esRkjWB6g9U0IhgeQU03hsy1bjSO1fvPTZ0LmuYGY/j4Gm7OQnl9cYUnqIVmpH9aD2Kql6GhrQ0Slaehm0ca8EOacadEd8TzlzJnOa04NiOw7VZ6GPv7BOs/W4cxc9Ckv3gR18H3BdeiKdUHtDMu5RykkXQU6aPi/hbFCWmnjY/FzWsAGfCTDsJHneV7fhB7nmQhywcMF3SlUcQPiBLmIwdsYA0bkAaG6qffWlaeXAK7hz00VfDKQETIKPvh70wKE4GhoZhsxFmC5ykXMejY4XlHewMIQLAp1ejwqzJ8Kh0bIecbEmxfEBhYeuOA3IAor9BFQALWnpiVuspAWINFPvANjMFhPyWW136QXDHVYYWPUfAXf/seGvU4nv8Y0wtlAt7B6SVfjLoKyn0WzuANoJqI2YqofD2eMl3F+cJbtnF36CHrfArmauuBcgMEcFQ5QhI42B8kSAA3fHnyhRdK1eWag9Glj5mRMu6zpLhvVQrPbW7Qn/cw/0EyrNGNSfjH9BJiZEfUpDuZbSKFz1LbyGV8jMXiGzunCUHmNM7p7tynA9HzN86xt48JUwDfuUjmdDirOy5farXj+S2jSPaMghuJS4e+TEAqKnlqWaMgjrsuL1oco45Ry0p/+4pqwDbOQrwUObb4efRf0lC6hP6JerRwrD8rW1bwCtgjKDoLYaWS/+sBwxauMTxEnNloGQe+GB8s2x7LLBttWkZHbELUUBizIBRZpjH87PHU+sRDjMCMCCBd7fyBkIWfNEtrwsG8kEVwEBQTihJtdk4BwCjX13vVraECyVZrGdYIBUxcwtK5RwTrhFBNcj3xvDUX0WUF1LOgtrjvh55uw43pWQAabnVad0 mM81uitf ZaakyobtrfVaRhLrw3e58MCoWmBv0xr3P0AgWLFPjXAI9o/9t2qA1xwf2P3kh8ycZHUFLM3x2J2UAWFPreZrV/n0lRMBpBUqPphFacennF6MMgXcVBR3zB56seJYA+6pvh94QwGwfcZW3Mk/CqXVIGF/djbM38t0JVbsAYMNPn/uppYaPpa02WUQ518+mRNVambAgkt03Jqsz17g6cRD8wtD/Dfjb1dOIiMpXYsoPlCr77WOMU1AiUqtoAubJnxOf905P6/RJFgL2D324Bx1x+aqtQ0AZR4hE05/vQcpzUNnCHNODkWNJQk5gyk0r677BdtNHSxjf4uz/zVwjM1F5Ca0u3toEyL3obGSiRfL4zaFL4HOCns3YJdyJwfQpfkqivmMc 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: Extract from current /proc/self/smaps output: Swap: 0 kB SwapPss: 0 kB Locked: 0 kB THPeligible: 0 ProtectionKey: 0 That's not the alignment shown in Documentation/filesystems/proc.rst: it's an ugly artifact from missing out the %8 other fields are using; but there's even one selftest which expects it to look that way. Hoping no other smaps parsers depend on THPeligible to look so ugly, fix these. Signed-off-by: Hugh Dickins --- fs/proc/task_mmu.c | 2 +- tools/testing/selftests/proc/proc-empty-vm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index 51315133cdc2..15ddf4653a19 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -855,7 +855,7 @@ static int show_smap(struct seq_file *m, void *v) __show_smap(m, &mss, false); - seq_printf(m, "THPeligible: %d\n", + seq_printf(m, "THPeligible: %8u\n", hugepage_vma_check(vma, vma->vm_flags, true, false, true)); if (arch_pkeys_enabled()) diff --git a/tools/testing/selftests/proc/proc-empty-vm.c b/tools/testing/selftests/proc/proc-empty-vm.c index dfbcb3ce2194..b16c13688b88 100644 --- a/tools/testing/selftests/proc/proc-empty-vm.c +++ b/tools/testing/selftests/proc/proc-empty-vm.c @@ -82,7 +82,7 @@ static const char proc_pid_smaps_vsyscall_1[] = "Swap: 0 kB\n" "SwapPss: 0 kB\n" "Locked: 0 kB\n" -"THPeligible: 0\n" +"THPeligible: 0\n" /* * "ProtectionKey:" field is conditional. It is possible to check it as well, * but I don't have such machine. @@ -112,7 +112,7 @@ static const char proc_pid_smaps_vsyscall_2[] = "Swap: 0 kB\n" "SwapPss: 0 kB\n" "Locked: 0 kB\n" -"THPeligible: 0\n" +"THPeligible: 0\n" /* * "ProtectionKey:" field is conditional. It is possible to check it as well, * but I'm too tired.