lkml.org 
[lkml]   [2019]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 91/96] mm/vmstat.c: fix /proc/vmstat format for CONFIG_DEBUG_TLBFLUSH=y CONFIG_SMP=n
    Date
    From: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>

    commit e8277b3b52240ec1caad8e6df278863e4bf42eac upstream.

    Commit 58bc4c34d249 ("mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly")
    depends on skipping vmstat entries with empty name introduced in
    7aaf77272358 ("mm: don't show nr_indirectly_reclaimable in
    /proc/vmstat") but reverted in b29940c1abd7 ("mm: rename and change
    semantics of nr_indirectly_reclaimable_bytes").

    So skipping no longer works and /proc/vmstat has misformatted lines " 0".

    This patch simply shows debug counters "nr_tlb_remote_*" for UP.

    Link: http://lkml.kernel.org/r/155481488468.467.4295519102880913454.stgit@buzz
    Fixes: 58bc4c34d249 ("mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly")
    Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
    Acked-by: Vlastimil Babka <vbabka@suse.cz>
    Cc: Roman Gushchin <guro@fb.com>
    Cc: Jann Horn <jannh@google.com>
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    mm/vmstat.c | 5 -----
    1 file changed, 5 deletions(-)

    --- a/mm/vmstat.c
    +++ b/mm/vmstat.c
    @@ -1272,13 +1272,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 */

    \
     
     \ /
      Last update: 2019-04-24 19:46    [W:4.118 / U:0.852 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site