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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7560BC6FD1D for ; Tue, 21 Mar 2023 10:35:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EC2EB6B0075; Tue, 21 Mar 2023 06:35:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E4B856B0078; Tue, 21 Mar 2023 06:35:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CED606B007B; Tue, 21 Mar 2023 06:35:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id B97166B0075 for ; Tue, 21 Mar 2023 06:35:09 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 75D2E1213F1 for ; Tue, 21 Mar 2023 10:35:09 +0000 (UTC) X-FDA: 80592547938.30.1F1C520 Received: from harvie.cz (harvie.cz [77.87.242.242]) by imf11.hostedemail.com (Postfix) with ESMTP id 3385340016 for ; Tue, 21 Mar 2023 10:35:06 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (imf11.hostedemail.com: 77.87.242.242 is neither permitted nor denied by domain of tomas.mudrunka@gmail.com) smtp.mailfrom=tomas.mudrunka@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1679394907; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=s7gboLieM5BBUabAC6uhW3Bs1jzFfkQZJn/zEFQ1lSg=; b=kBGqkM+8sXvzFx1T+pD+cTKKbhkV5bGWvJvcH6DAq26IbMojVBV36Ijn/Pn8wOxumLmFHQ 6MxoVcHrhs3wkoeFCob7zorRStkkseUd5OIzkGAynClJYFLfoqu3Zyl75agYaQai2KDZtU QTz7TJE7xA7qkR/h4U2FTM91+KASXL0= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (imf11.hostedemail.com: 77.87.242.242 is neither permitted nor denied by domain of tomas.mudrunka@gmail.com) smtp.mailfrom=tomas.mudrunka@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679394907; a=rsa-sha256; cv=none; b=fyOd8gBg8QQR5mB9JtU7CrRmBIh/zSfLHFxha6dWEZjTsy/le1qWGHtL2qw4DXoGT84LVY fKxuVkhLj5SSrHYBf35+N8yctwzB+tRhZYzoP0/+vKpuPQeuFbGgRSPXkAn1Dl0ooetCPY rATlpP22hIXcG3Eb8VCTetD8/0cwXl0= Received: from anemophobia.amit.cz (unknown [31.30.84.130]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by harvie.cz (Postfix) with ESMTPSA id D37151801B5; Tue, 21 Mar 2023 11:35:04 +0100 (CET) From: Tomas Mudrunka To: akpm@linux-foundation.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, rppt@kernel.org, linux-doc@vger.kernel.org, corbet@lwn.net, tomas.mudrunka@gmail.com Subject: [PATCH v2] Add results of early memtest to /proc/meminfo Date: Tue, 21 Mar 2023 11:34:30 +0100 Message-Id: <20230321103430.7130-1-tomas.mudrunka@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230317165637.6be5414a3eb05d751da7d19f@linux-foundation.org> References: <20230317165637.6be5414a3eb05d751da7d19f@linux-foundation.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3385340016 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: 4exbgon5wpwr4whf8meem94i1maaqyjy X-HE-Tag: 1679394906-268868 X-HE-Meta: U2FsdGVkX1+057KL/OMNRq7weWzMWeK+vXtZoU48sc75kB8evyOrgUTUyznZIBfaIhCA6rIGRVl82NkoLq81x1Bj/gIk3Ph6Hp/ehZHxM3KdTBghWHQrNY1+ZeEiJ5DEZkRDMrSpeKmS8XFmoW1BfC8Hw/CT810hDxoDl6iuAK3fS7xfNWVd92g5Z027zWAAnq67eHA+PaZ12weGOnuu4+QbjdvnlWQvpqpkZrAln/+yFpyL1Thkwn3gFfRUv+xG5LwlviN0qMREcSN8OfEK61gb26YkSPqCk6uIfnkndtY5DoXU1XCyVF76/BvuWDDXgQNcS+b+680imbUCpryo96ZEi5T2U7xttHKZgDX3sA58XzdTHF4S3UU+NPSz9uFD7O3o2cR22QxzHmOC7e3enK4BBBCBuOP9LaiXKpKvnhkOBx4ON8KEtMCXg7rLpvlf1FS5F+nKP7sfUvCfcYGyoTqHXJP6o9MHwl+EWaRzcrgZ4O8CE9JS9zvNHnoq+1NtA3QIP4Xpy9CpTH73Y55s1HtiVim3QFOVlM5LM+8SbtneDnk759y51I6fjCnePMi5j/MB9JUC16fjmxtxGWxlJl0fxEp7V+4BnPrl6xMnjEVdo9xv8Tvl+B4jIp3dtj/Wn6sQfYY3ErcCPS4YtWqlc0mQVSoRFo+gbhsi3GQEK2OyveZy268EafxT3yaVmzhOyJbSeQEElhaLPsZmg+5wCHEFdTdnbG5NGkQiKXUtmZCoOnY/3PMLS4Rs+b8r/tsr+L2gLd2bHSuP2iwun7DG+hDm1+xfKjVyqtVqfaWwJcceaFTizSq8UlwkBjtyIaVHWkVbaEiIrywEedUy/VkL/nLloMu8WJwbbhYGI43zWSdzhIf0g6MXcLlpzTF8oHzj5RG58Z/8JZBcBof44Z5iBgHN4pu0CrtdkM5L7pku7hEOQbd4Ewh5xPX7mNL5bhSiXfHBGm44EwKbWGB+Tuz 2Bb3y092 9so7DK6b36i6ehp96xqLjZ0UxEtpdezvcgEwy2XWE0+aUzcG+LpAJZdA0QKOzgQ+gDAGVfvggENOpeeSB0ne+jeLqg2XOd/pmMfEPFxT+KF6ke59aZT7JQAz+zjoPRyi1vb8LuNS7tTeao9T2oiFIogMhG2dEv1Tj+2Frb0GkKmAY90CsN+nja18Bs7NisM7OYfUoiK0MtpVLvXCHI0j2BPCwytkjZ/hFmuxdoWJcXVD4CAAaSnz/LNHZvRobQpYgFy+oC44Vpqx+cVBlkk21syqJwKHQ1QobRjhb5cVMAGnk+5DX/NEBxy6dCDBSM5QBH/9cO7PE84+HGDGyC2fCcnOGgT1q5EYFzOUgIQfDYzr50WkglH55Lu9ximosrxD6PYPQTzgTfaL/5oc= 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: Currently the memtest results were only presented in dmesg. This adds /proc/meminfo entry which can be easily used by scripts. Signed-off-by: Tomas Mudrunka --- Documentation/filesystems/proc.rst | 8 ++++++++ fs/proc/meminfo.c | 13 +++++++++++++ include/linux/memblock.h | 2 ++ mm/memtest.c | 6 ++++++ 4 files changed, 29 insertions(+) diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 9d5fd9424..8740362f3 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -996,6 +996,7 @@ Example output. You may not have all of these fields. VmallocUsed: 40444 kB VmallocChunk: 0 kB Percpu: 29312 kB + EarlyMemtestBad: 0 kB HardwareCorrupted: 0 kB AnonHugePages: 4149248 kB ShmemHugePages: 0 kB @@ -1146,6 +1147,13 @@ VmallocChunk Percpu Memory allocated to the percpu allocator used to back percpu allocations. This stat excludes the cost of metadata. +EarlyMemtestBad + The amount of RAM/memory in kB, that was identified as corrupted + by early memtest. If memtest was not run, this field will not + be displayed at all. Size is never rounded down to 0 kB. + That means if 0 kB is reported, you can safely assume + there was at least one pass of memtest and none of the passes + found a single faulty byte of RAM. HardwareCorrupted The amount of RAM/memory in KB, the kernel identifies as corrupted. diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index 440960110..b43d0bd42 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -131,6 +132,18 @@ static int meminfo_proc_show(struct seq_file *m, void *v) show_val_kb(m, "VmallocChunk: ", 0ul); show_val_kb(m, "Percpu: ", pcpu_nr_pages()); +#ifdef CONFIG_MEMTEST + if (early_memtest_done) { + unsigned long early_memtest_bad_size_kb; + + early_memtest_bad_size_kb = early_memtest_bad_size>>10; + if (early_memtest_bad_size && !early_memtest_bad_size_kb) + early_memtest_bad_size_kb = 1; + /* When 0 is reported, it means there actually was a successful test */ + seq_printf(m, "EarlyMemtestBad: %5lu kB\n", early_memtest_bad_size_kb); + } +#endif + #ifdef CONFIG_MEMORY_FAILURE seq_printf(m, "HardwareCorrupted: %5lu kB\n", atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)); diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 50ad19662..f82ee3fac 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -597,6 +597,8 @@ extern int hashdist; /* Distribute hashes across NUMA nodes? */ #endif #ifdef CONFIG_MEMTEST +extern phys_addr_t early_memtest_bad_size; /* Size of faulty ram found by memtest */ +extern bool early_memtest_done; /* Was early memtest done? */ extern void early_memtest(phys_addr_t start, phys_addr_t end); #else static inline void early_memtest(phys_addr_t start, phys_addr_t end) diff --git a/mm/memtest.c b/mm/memtest.c index f53ace709..57149dfee 100644 --- a/mm/memtest.c +++ b/mm/memtest.c @@ -4,6 +4,9 @@ #include #include +bool early_memtest_done; +phys_addr_t early_memtest_bad_size; + static u64 patterns[] __initdata = { /* The first entry has to be 0 to leave memtest with zeroed memory */ 0, @@ -30,6 +33,7 @@ static void __init reserve_bad_mem(u64 pattern, phys_addr_t start_bad, phys_addr pr_info(" %016llx bad mem addr %pa - %pa reserved\n", cpu_to_be64(pattern), &start_bad, &end_bad); memblock_reserve(start_bad, end_bad - start_bad); + early_memtest_bad_size += (end_bad - start_bad); } static void __init memtest(u64 pattern, phys_addr_t start_phys, phys_addr_t size) @@ -61,6 +65,8 @@ static void __init memtest(u64 pattern, phys_addr_t start_phys, phys_addr_t size } if (start_bad) reserve_bad_mem(pattern, start_bad, last_bad + incr); + + early_memtest_done = true; } static void __init do_one_pass(u64 pattern, phys_addr_t start, phys_addr_t end) -- 2.40.0