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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 1EAF1C433E0 for ; Tue, 9 Mar 2021 00:18:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D5B5965287 for ; Tue, 9 Mar 2021 00:18:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232095AbhCIAMD (ORCPT ); Mon, 8 Mar 2021 19:12:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232112AbhCIALu (ORCPT ); Mon, 8 Mar 2021 19:11:50 -0500 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F01BC06174A for ; Mon, 8 Mar 2021 16:11:49 -0800 (PST) Received: by mail-ej1-x62c.google.com with SMTP id mj10so23975138ejb.5 for ; Mon, 08 Mar 2021 16:11:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=7S+uifTuzp5DoZcXR8fUrkrnbuEPn9xXlGu3V6LLQPY=; b=XffjNWC/ElUKr97poPnZfOllbB87Kj+qT1u4i4ukzXktWwvVHLdbUHgxLshWPXWnV3 YkXSfDNEcY2mOE5dFI2pt/TrCYqI7CtEVJO9/ydbDjAvDuPIunezV78wEb4EsDEoTfxg TyuAVuH1plNfYa743uU4mBWaJIG7inSMOXAvsVBF4NW3VuMyybLcW7RqffSa08PlNKbj E5Ff6gFsnCAGFNRqQTakoGJfvpqxSxudx8apymssSM6u0jbPGxkZh25mGDvwmljc0+pW ih+5VhAaWiFXZFwalxTHKHcAIWT8d/5BHGf+971sM6/22RWyrn03hIy+qG9g6UQWbP5K Nkxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=7S+uifTuzp5DoZcXR8fUrkrnbuEPn9xXlGu3V6LLQPY=; b=qkckKElJuSywqE1H95lSeBZkUieSk4KlviGSwzo0ksDOj6pqmDA/Q++C4aqVV3JEQL 7tV8O5EK/kcu+7yiFfXklBsbPP9Ig7uJ9wrXUIQxkIHJ2KgilD8VT4x5rDWBGhpla5u8 2EoIV0wKfCiLY8EKK9laLpWTfHbrCwT6jvaxvOQDeGThc4RYImEFlpWtuxZ7lbyY45MJ HX5KLYmCswTuwswNo/1Ne1ml6NL01LvLbbD8CG0QSrCnoROJkkEE9GNXMNxscgAg89au eZ7Z0SwLSogvqvsYIJwdHndtNTHkJD8mAoZ6aPuJ1zM+xggf/w9wk8r8i6cBPtL7kqxx gW8Q== X-Gm-Message-State: AOAM533cV/Y3My1b4lJzP8W1K5hdrD9yrWTcb8Gvt7m00YvKRP85j0Bt +ef4pUFzOxCSM36B6/4ywfmiuS1WTLk4UqphE7Z+nePlxEw= X-Google-Smtp-Source: ABdhPJxWkwTmEUFi6fcF0vwoczQxwHGvYkoLiWPZxrUXwxMxmaRvlPzg+McQ3CQID6v/Dtd+rzM8Q/vjIuz6n8iIdm4= X-Received: by 2002:a17:907:2bf6:: with SMTP id gv54mr17808640ejc.514.1615248708462; Mon, 08 Mar 2021 16:11:48 -0800 (PST) MIME-Version: 1.0 References: <20210304235949.7922C1C3@viggo.jf.intel.com> <20210305000000.48BA4A97@viggo.jf.intel.com> In-Reply-To: <20210305000000.48BA4A97@viggo.jf.intel.com> From: Yang Shi Date: Mon, 8 Mar 2021 16:11:36 -0800 Message-ID: Subject: Re: [PATCH 06/10] mm/vmscan: add page demotion counter To: Dave Hansen Cc: Linux Kernel Mailing List , Linux MM , Yang Shi , David Rientjes , Huang Ying , Dan Williams , David Hildenbrand , Oscar Salvador Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 4, 2021 at 4:01 PM Dave Hansen wrote: > > > From: Yang Shi > > Account the number of demoted pages into reclaim_state->nr_demoted. > > Add pgdemote_kswapd and pgdemote_direct VM counters showed in > /proc/vmstat. > > [ daveh: > - __count_vm_events() a bit, and made them look at the THP > size directly rather than getting data from migrate_pages() > ] > > Signed-off-by: Yang Shi > Signed-off-by: Dave Hansen > Cc: David Rientjes > Cc: Huang Ying > Cc: Dan Williams > Cc: David Hildenbrand > Cc: osalvador > > -- > > Changes since 202010: > * remove unused scan-control 'demoted' field Reviewed-by: Yang Shi > --- > > b/include/linux/vm_event_item.h | 2 ++ > b/mm/vmscan.c | 5 +++++ > b/mm/vmstat.c | 2 ++ > 3 files changed, 9 insertions(+) > > diff -puN include/linux/vm_event_item.h~mm-vmscan-add-page-demotion-counter include/linux/vm_event_item.h > --- a/include/linux/vm_event_item.h~mm-vmscan-add-page-demotion-counter 2021-03-04 15:35:57.698806425 -0800 > +++ b/include/linux/vm_event_item.h 2021-03-04 15:35:57.719806425 -0800 > @@ -33,6 +33,8 @@ enum vm_event_item { PGPGIN, PGPGOUT, PS > PGREUSE, > PGSTEAL_KSWAPD, > PGSTEAL_DIRECT, > + PGDEMOTE_KSWAPD, > + PGDEMOTE_DIRECT, > PGSCAN_KSWAPD, > PGSCAN_DIRECT, > PGSCAN_DIRECT_THROTTLE, > diff -puN mm/vmscan.c~mm-vmscan-add-page-demotion-counter mm/vmscan.c > --- a/mm/vmscan.c~mm-vmscan-add-page-demotion-counter 2021-03-04 15:35:57.700806425 -0800 > +++ b/mm/vmscan.c 2021-03-04 15:35:57.724806425 -0800 > @@ -1118,6 +1118,11 @@ static unsigned int demote_page_list(str > target_nid, MIGRATE_ASYNC, MR_DEMOTION, > &nr_succeeded); > > + if (current_is_kswapd()) > + __count_vm_events(PGDEMOTE_KSWAPD, nr_succeeded); > + else > + __count_vm_events(PGDEMOTE_DIRECT, nr_succeeded); > + > return nr_succeeded; > } > > diff -puN mm/vmstat.c~mm-vmscan-add-page-demotion-counter mm/vmstat.c > --- a/mm/vmstat.c~mm-vmscan-add-page-demotion-counter 2021-03-04 15:35:57.708806425 -0800 > +++ b/mm/vmstat.c 2021-03-04 15:35:57.726806425 -0800 > @@ -1244,6 +1244,8 @@ const char * const vmstat_text[] = { > "pgreuse", > "pgsteal_kswapd", > "pgsteal_direct", > + "pgdemote_kswapd", > + "pgdemote_direct", > "pgscan_kswapd", > "pgscan_direct", > "pgscan_direct_throttle", > _ >