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=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED 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 4D2F9C10F0E for ; Tue, 9 Apr 2019 13:16:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 19A7B2084C for ; Tue, 9 Apr 2019 13:16:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727472AbfDINQq (ORCPT ); Tue, 9 Apr 2019 09:16:46 -0400 Received: from mx2.suse.de ([195.135.220.15]:55734 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726035AbfDINQp (ORCPT ); Tue, 9 Apr 2019 09:16:45 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 82974AF7B; Tue, 9 Apr 2019 13:16:44 +0000 (UTC) Subject: Re: [PATCH] mm/vmstat: fix /proc/vmstat format for CONFIG_DEBUG_TLBFLUSH=y CONFIG_SMP=n To: Konstantin Khlebnikov , linux-mm@kvack.org, Andrew Morton , linux-kernel@vger.kernel.org Cc: Roman Gushchin , Jann Horn References: <155481488468.467.4295519102880913454.stgit@buzz> From: Vlastimil Babka Message-ID: Date: Tue, 9 Apr 2019 15:16:44 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <155481488468.467.4295519102880913454.stgit@buzz> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 4/9/19 3:01 PM, Konstantin Khlebnikov wrote: > Commit 58bc4c34d249 ("mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly") > depends on skipping vmstat entries with empty name introduced in commit > 7aaf77272358 ("mm: don't show nr_indirectly_reclaimable in /proc/vmstat") > but reverted in commit b29940c1abd7 ("mm: rename and change semantics of > nr_indirectly_reclaimable_bytes"). Oops, good catch. > So, skipping no longer works and /proc/vmstat has misformatted lines " 0". > This patch simply shows debug counters "nr_tlb_remote_*" for UP. Right, that's the the best solution IMHO. > Fixes: 58bc4c34d249 ("mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly") > Signed-off-by: Konstantin Khlebnikov Acked-by: Vlastimil Babka > --- > mm/vmstat.c | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/mm/vmstat.c b/mm/vmstat.c > index 36b56f858f0f..a7d493366a65 100644 > --- a/mm/vmstat.c > +++ b/mm/vmstat.c > @@ -1274,13 +1274,8 @@ const char * const vmstat_text[] = { > #endif > #endif /* CONFIG_MEMORY_BALLOON */ > #ifdef CONFIG_DEBUG_TLBFLUSH > -#ifdef CONFIG_SMP > "nr_tlb_remote_flush", > "nr_tlb_remote_flush_received", > -#else > - "", /* nr_tlb_remote_flush */ > - "", /* nr_tlb_remote_flush_received */ > -#endif /* CONFIG_SMP */ > "nr_tlb_local_flush_all", > "nr_tlb_local_flush_one", > #endif /* CONFIG_DEBUG_TLBFLUSH */ >