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 X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6784C433E1 for ; Sat, 15 Aug 2020 00:30:10 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AD1F1214F1 for ; Sat, 15 Aug 2020 00:30:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="HDUWH6Me" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AD1F1214F1 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linux-foundation.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 576716B0007; Fri, 14 Aug 2020 20:30:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 54E546B0008; Fri, 14 Aug 2020 20:30:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 467B76B000A; Fri, 14 Aug 2020 20:30:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0238.hostedemail.com [216.40.44.238]) by kanga.kvack.org (Postfix) with ESMTP id 2A5256B0007 for ; Fri, 14 Aug 2020 20:30:10 -0400 (EDT) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id E82DC82655D6 for ; Sat, 15 Aug 2020 00:30:09 +0000 (UTC) X-FDA: 77150920938.08.flock57_291692b27001 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin08.hostedemail.com (Postfix) with ESMTP id BE8F71819E769 for ; Sat, 15 Aug 2020 00:30:09 +0000 (UTC) X-HE-Tag: flock57_291692b27001 X-Filterd-Recvd-Size: 3418 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf11.hostedemail.com (Postfix) with ESMTP for ; Sat, 15 Aug 2020 00:30:09 +0000 (UTC) Received: from localhost.localdomain (c-73-231-172-41.hsd1.ca.comcast.net [73.231.172.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3684E20885; Sat, 15 Aug 2020 00:30:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597451408; bh=KRcdZYKBYDpbzRiT1KFMulPfq0YwNH+U+JnKO7So524=; h=Date:From:To:Subject:In-Reply-To:From; b=HDUWH6Me5cyJ/mk5XCExM7YjBK4dwu7s5ZXuWA/DaYDAhgbcQLrjsPEnma7HQnFmB 2ss0weBVc4loC9SOnPOdaQtL9e/uxQddhA+uLuzH37kg3CL87jUZd7NhgJ8/xKcKv+ 4CZzFIURmHR3qRL8pj16y2VVAGCzzXqDeJSwKNkE= Date: Fri, 14 Aug 2020 17:30:07 -0700 From: Andrew Morton To: akpm@linux-foundation.org, bhe@redhat.com, david@redhat.com, linux-mm@kvack.org, mm-commits@vger.kernel.org, rientjes@google.com, sonnyrao@chromium.org, stable@vger.kernel.org, torvalds@linux-foundation.org Subject: [patch 02/39] Revert "mm/vmstat.c: do not show lowmem reserve protection information of empty zone" Message-ID: <20200815003007.GWlu7N4q0%akpm@linux-foundation.org> In-Reply-To: <20200814172939.55d6d80b6e21e4241f1ee1f3@linux-foundation.org> User-Agent: s-nail v14.8.16 X-Rspamd-Queue-Id: BE8F71819E769 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 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: From: Baoquan He Subject: Revert "mm/vmstat.c: do not show lowmem reserve protection information of empty zone" This reverts commit 26e7deadaae175. Sonny reported that one of their tests started failing on the latest kernel on their Chrome OS platform. The root cause is that the above commit removed the protection line of empty zone, while the parser used in the test relies on the protection line to mark the end of each zone. Let's revert it to avoid breaking userspace testing or applications. Link: http://lkml.kernel.org/r/20200811075412.12872-1-bhe@redhat.com Fixes: 26e7deadaae175 ("mm/vmstat.c: do not show lowmem reserve protection information of empty zone)" Signed-off-by: Baoquan He Reported-by: Sonny Rao Reviewed-by: David Hildenbrand Acked-by: David Rientjes Cc: [5.8.x] Signed-off-by: Andrew Morton --- mm/vmstat.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- a/mm/vmstat.c~revert-mm-vmstatc-do-not-show-lowmem-reserve-protection-information-of-empty-zone +++ a/mm/vmstat.c @@ -1642,12 +1642,6 @@ static void zoneinfo_show_print(struct s zone->present_pages, zone_managed_pages(zone)); - /* If unpopulated, no other information is useful */ - if (!populated_zone(zone)) { - seq_putc(m, '\n'); - return; - } - seq_printf(m, "\n protection: (%ld", zone->lowmem_reserve[0]); @@ -1655,6 +1649,12 @@ static void zoneinfo_show_print(struct s seq_printf(m, ", %ld", zone->lowmem_reserve[i]); seq_putc(m, ')'); + /* If unpopulated, no other information is useful */ + if (!populated_zone(zone)) { + seq_putc(m, '\n'); + return; + } + for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++) seq_printf(m, "\n %-12s %lu", zone_stat_name(i), zone_page_state(zone, i)); _