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=-6.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham 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 BF286C282DD for ; Thu, 18 Apr 2019 18:06:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8FA7921872 for ; Thu, 18 Apr 2019 18:06:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555610815; bh=BO6Q3LeR74hWH6fO4Z2YxuwA+OpqTZMJEe+77T7oqGc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=I0KRTCRfmTqDUa7K0rgPlpUCjL6rPsEProFj9631YbutaGOHqFSU3pavWw44o6PIq LMqcmhHYK7gqhOAzTHd/7eytPGm3bk9Wz3d2nJoOgzv/6+LAXm5z2hqYUBg1l3OkXE mc/0lbL0KFB8qGsiP+sxTOHXBmUmZixDCfMLlI4c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391163AbfDRSGy (ORCPT ); Thu, 18 Apr 2019 14:06:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:36858 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391542AbfDRSGv (ORCPT ); Thu, 18 Apr 2019 14:06:51 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 1A84D218A6; Thu, 18 Apr 2019 18:06:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555610810; bh=BO6Q3LeR74hWH6fO4Z2YxuwA+OpqTZMJEe+77T7oqGc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QMu88u9wgd3ek8SvPUuplQFCkbUuggUNaErj7r/fg86aeTDT1BUduR67xVLdy9K2P 3OfGulBO69DXZPVuW4c735Xu9yK6nXtbJAUCnZJDvUBlmZkeHfngWmt2X3BPoXxr2f RTe1i/SaqMwpx9WCxmy9M1VjZ7TA5wkq3jxfm2BQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Konstantin Khlebnikov , Roman Gushchin , Vlastimil Babka Subject: [PATCH 4.14 92/92] [PATCH 4.19.y 2/2] mm: hide incomplete nr_indirectly_reclaimable in sysfs Date: Thu, 18 Apr 2019 19:57:50 +0200 Message-Id: <20190418160438.583188342@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190418160430.325165109@linuxfoundation.org> References: <20190418160430.325165109@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Konstantin Khlebnikov In upstream branch this fixed by commit b29940c1abd7 ("mm: rename and change semantics of nr_indirectly_reclaimable_bytes"). This fixes /sys/devices/system/node/node*/vmstat format: ... nr_dirtied 6613155 nr_written 5796802 11089216 ... Cc: # 4.19.y Fixes: 7aaf77272358 ("mm: don't show nr_indirectly_reclaimable in /proc/vmstat") Signed-off-by: Konstantin Khlebnikov Cc: Roman Gushchin Cc: Vlastimil Babka Signed-off-by: Greg Kroah-Hartman --- drivers/base/node.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -197,11 +197,16 @@ static ssize_t node_read_vmstat(struct d sum_zone_numa_state(nid, i)); #endif - for (i = 0; i < NR_VM_NODE_STAT_ITEMS; i++) + for (i = 0; i < NR_VM_NODE_STAT_ITEMS; i++) { + /* Skip hidden vmstat items. */ + if (*vmstat_text[i + NR_VM_ZONE_STAT_ITEMS + + NR_VM_NUMA_STAT_ITEMS] == '\0') + continue; n += sprintf(buf+n, "%s %lu\n", vmstat_text[i + NR_VM_ZONE_STAT_ITEMS + NR_VM_NUMA_STAT_ITEMS], node_page_state(pgdat, i)); + } return n; }