From mboxrd@z Thu Jan 1 00:00:00 1970 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 5C670EE4996 for ; Mon, 21 Aug 2023 20:44:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231445AbjHUUoQ (ORCPT ); Mon, 21 Aug 2023 16:44:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229837AbjHUUn3 (ORCPT ); Mon, 21 Aug 2023 16:43:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99753CE7 for ; Mon, 21 Aug 2023 13:42:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7A08164B18 for ; Mon, 21 Aug 2023 20:42:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CFCD3C433C7; Mon, 21 Aug 2023 20:42:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1692650523; bh=CBkVoyDN3+r6+pOSif2egfuort/aDK8wdaFYauu8vFI=; h=Date:To:From:Subject:From; b=Ae37OU/LK4K+bExl6aY1Odir1aO3LJg2OUvmT+D3BZ3OXK5Mq0QZdLn47kWPVz78n RE45/EhqTwTm9OplwB/Pef+M7I2iLxHhSqKXGK+mTSM3HlAU1jwIcZ9oWvFQBZKbRY VdizdK5F8w/1Ia4IYTYzw62eo5g6NL124aCZXKJc= Date: Mon, 21 Aug 2023 13:42:03 -0700 To: mm-commits@vger.kernel.org, adobriyan@gmail.com, hughd@google.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] mmthp-fix-smaps-thpeligible-output-alignment.patch removed from -mm tree Message-Id: <20230821204203.CFCD3C433C7@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: mm,thp: fix smaps THPeligible output alignment has been removed from the -mm tree. Its filename was mmthp-fix-smaps-thpeligible-output-alignment.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Hugh Dickins Subject: mm,thp: fix smaps THPeligible output alignment Date: Mon, 14 Aug 2023 13:02:08 -0700 (PDT) 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. Link: https://lkml.kernel.org/r/cfb81f7a-f448-5bc2-b0e1-8136fcd1dd8c@google.com Signed-off-by: Hugh Dickins Cc: Alexey Dobriyan Signed-off-by: Andrew Morton --- fs/proc/task_mmu.c | 2 +- tools/testing/selftests/proc/proc-empty-vm.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) --- a/fs/proc/task_mmu.c~mmthp-fix-smaps-thpeligible-output-alignment +++ a/fs/proc/task_mmu.c @@ -854,7 +854,7 @@ static int show_smap(struct seq_file *m, __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()) --- a/tools/testing/selftests/proc/proc-empty-vm.c~mmthp-fix-smaps-thpeligible-output-alignment +++ a/tools/testing/selftests/proc/proc-empty-vm.c @@ -77,7 +77,7 @@ static const char proc_pid_smaps_vsyscal "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. @@ -107,7 +107,7 @@ static const char proc_pid_smaps_vsyscal "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. _ Patches currently in -mm which might be from hughd@google.com are tmpfsxattr-gfp_kernel_account-for-simple-xattrs.patch