From nobody Thu Dec 18 07:52:38 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3FA0EB64DD for ; Mon, 14 Aug 2023 20:01:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230258AbjHNUAl (ORCPT ); Mon, 14 Aug 2023 16:00:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230282AbjHNUAV (ORCPT ); Mon, 14 Aug 2023 16:00:21 -0400 Received: from mail-oo1-xc2c.google.com (mail-oo1-xc2c.google.com [IPv6:2607:f8b0:4864:20::c2c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D814B10C8 for ; Mon, 14 Aug 2023 13:00:20 -0700 (PDT) Received: by mail-oo1-xc2c.google.com with SMTP id 006d021491bc7-56ccdb2c7bbso3301848eaf.1 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=AdRdmy1dWGeWzxcGCBU6pe/ckUnPNePGgCdqmpwOETgVvhCTHTPhiav/gnkBJtM6zV GhWuMugKVm+OepHHh1BtqqxINLJ9DAMOdP93fIJ0Y4UfxW0jtRJEYxSPTIlO+nruayuZ Nx5+EPQdNSSiFx8PIQCjmMHzGhmSnVOznkFlB7olZO0yTAFyl+SbEZ8NEUB1PNhkx5wK cIz3s+91lbCDXHiLI+UFMtQzNWkr3xaFHZATDAtyH7rMXnNiTAMsI5FbYhRpx6A0oMLC pKxB2Hn+ixlh4pA31H5HDsEVCtEBt+Aac+2ItNHIfR3Wp4YGoYekxU8upJpryKsuXtW3 EWNQ== X-Gm-Message-State: AOJu0YyKjOwbz4zK5s8c5VmNAjUwVsk7Ncbwwc3dxzQLGYpLTLwBFVG4 uVph/UkQXLCUGvQh0E4RuqWvSg== 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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, nodema= sk_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" --=20 2.35.3 From nobody Thu Dec 18 07:52:38 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90DC7C001B0 for ; Mon, 14 Aug 2023 20:02:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232307AbjHNUBr (ORCPT ); Mon, 14 Aug 2023 16:01:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231968AbjHNUBP (ORCPT ); Mon, 14 Aug 2023 16:01:15 -0400 Received: from mail-oi1-x22b.google.com (mail-oi1-x22b.google.com [IPv6:2607:f8b0:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6A8A10F4 for ; Mon, 14 Aug 2023 13:01:14 -0700 (PDT) Received: by mail-oi1-x22b.google.com with SMTP id 5614622812f47-3a3efebcc24so4015485b6e.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=IGSBkwYshW2+PvWno4WwI+GphoXPSYH6x/TkByeuv5rK4WuBh8z7WyIoJN72RoxBIg /jqOtwauACyOAgH/U2zS8BvROuOMqUJw2IiGDS1zOuYJ3Wfxh2PFxYeu9eD6JpTyVJdM QM4LUjV581Vm48sYsuXYclCxw+nSSaiMuTzlyDSE4RFPfrbXOq3irrFl/r7cNqMSa/vq h0L/b0zlXpLYLjjJFtQ0WHeFByik9KCZ30cjHImoBvxtfgeae+VGVxCBNpU/9IadC+SO JM5J5Zqv8tJIpuVBRBb2PtBaq+j7IppNdoAPhJn8mA3Z/B+5wIoEUIHgkwvNdTm56Asc UPiw== X-Gm-Message-State: AOJu0Yy56rAhBwCkvckSzy1J9QO3eoUEtFNtr4PDZG7fJF48DqzYoY8B x7Akhz3iKaJHoDbziFIUbupQjA== 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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" --=20 2.35.3 From nobody Thu Dec 18 07:52:38 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59F0DEB64DD for ; Mon, 14 Aug 2023 20:03:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232334AbjHNUCt (ORCPT ); Mon, 14 Aug 2023 16:02:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232344AbjHNUCW (ORCPT ); Mon, 14 Aug 2023 16:02:22 -0400 Received: from mail-oa1-x29.google.com (mail-oa1-x29.google.com [IPv6:2001:4860:4864:20::29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C036910E5 for ; Mon, 14 Aug 2023 13:02:11 -0700 (PDT) Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-1c4d67f493bso1215648fac.2 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=OmghxXMqN+1HC3ZLyZXjJL7MVgfzRVLzoQiTi13UYlWF/Um2JhS5byv4Aj/HK1Vod2 4CrCUP86bAkqA/xYecDCeVjGz+utN/fKxq8yh7rr2PfhGRE+pkz8RoYUM6mAqzKSIhYT iX4fNpVF7r+KP3UmkYBz2CPRQ3ajS1wf/dIiYVJ4y26igbB2vLYN8cUkkvSIa2OEzHh7 7uNQ5KcNFfAP6h1ER92Kipd3APPwpWgv9/QYV2tPe7GBU6x0W1JYJZiepD9riaSvyABT AJQYEG65KSjpyQgLgXsThvah4OX5xktu8O3VNxwIaF9dj1Z2xnvTx+KpcrDZWgnI57bI Itng== X-Gm-Message-State: AOJu0YwYeckL2Us4kvDMb6vPF1tlw7S1DEyeTJ+GwIi9sxDlhpUlPEKs sv/LnfumKzUsx+I9PHcaDGeeSg== 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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) =20 __show_smap(m, &mss, false); =20 - seq_printf(m, "THPeligible: %d\n", + seq_printf(m, "THPeligible: %8u\n", hugepage_vma_check(vma, vma->vm_flags, true, false, true)); =20 if (arch_pkeys_enabled()) diff --git a/tools/testing/selftests/proc/proc-empty-vm.c b/tools/testing/s= elftests/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[] =3D "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 we= ll, * but I don't have such machine. @@ -112,7 +112,7 @@ static const char proc_pid_smaps_vsyscall_2[] =3D "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 we= ll, * but I'm too tired. --=20 2.35.3