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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB282C4345F for ; Fri, 12 Apr 2024 09:43:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5C9966B0087; Fri, 12 Apr 2024 05:43:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 57B736B0088; Fri, 12 Apr 2024 05:43:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 467EA6B0089; Fri, 12 Apr 2024 05:43:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 28A986B0087 for ; Fri, 12 Apr 2024 05:43:30 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id D615CA0E00 for ; Fri, 12 Apr 2024 09:43:29 +0000 (UTC) X-FDA: 82000392138.21.AF4EA90 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf08.hostedemail.com (Postfix) with ESMTP id F343C160012 for ; Fri, 12 Apr 2024 09:43:27 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=none; spf=pass (imf08.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712915008; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Pm9tS3IZ8oVS0ChCcZF/opHomU1RIuCfcn485FnO2LY=; b=2775p0S1NUv5L1kKs8wIcgTgbjUngMsFC84qdY6wBsxJV4PIwU4X3PDo1rtJtMrUE8I+Fu YblOIH9/DVpGY9c7XFkW/rR59Qy5UWrRZZqHTQO2mBlNXhyag7RJKj9Okk9fublSiLlcP5 2SuubntLbISa8OTyovdOaRxe+/KDymg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712915008; a=rsa-sha256; cv=none; b=1/lTyzxImAtxDNCGpi2HKluOmJw9rBToR5gm7xLqDuwyO63Fl7XvVEUPFE2k1frye1CdMw PToLDJpygaNiQk3hD17lHb69QTE1i6bpoB1vIo8u/aw3iQ0yciAGkl4WkvVglTrmoV3sxM Di+NUdBGGDi+KzB8goZwRA+wLQeWkRA= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=none; spf=pass (imf08.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5CF1B339; Fri, 12 Apr 2024 02:43:56 -0700 (PDT) Received: from [10.57.73.208] (unknown [10.57.73.208]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1B7D13F64C; Fri, 12 Apr 2024 02:43:24 -0700 (PDT) Message-ID: Date: Fri, 12 Apr 2024 10:43:23 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 2/4] mm: add per-order mTHP anon_swpout and anon_swpout_fallback counters Content-Language: en-GB To: Barry Song <21cnbao@gmail.com>, akpm@linux-foundation.org, linux-mm@kvack.org Cc: cerasuolodomenico@gmail.com, chrisl@kernel.org, david@redhat.com, kasong@tencent.com, linux-kernel@vger.kernel.org, peterx@redhat.com, surenb@google.com, v-songbaohua@oppo.com, willy@infradead.org, yosryahmed@google.com, yuzhao@google.com, corbet@lwn.net References: <20240412073740.294272-1-21cnbao@gmail.com> <20240412073740.294272-3-21cnbao@gmail.com> From: Ryan Roberts In-Reply-To: <20240412073740.294272-3-21cnbao@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: F343C160012 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: rpadfwybhp77ejnxaqfukctnmf6o4dko X-HE-Tag: 1712915007-815520 X-HE-Meta: U2FsdGVkX1/8OOnTXmgtv+pYQDXyjvUkPkiAdeherTsz6pT1IG7NgBdHO9xvDPfrWuI/ikRVcxVw/84PCWDEQP2GV58GJ0Kj16q0A6XPBCTy3R8icvRBl8Dr3Yn/nn08mC04BQkhi2BtiQPpwQhcfaeIapQGr3UxJHjo1ZyoXrm2/ONAfeXtkOeJ+FfYpRELwCywyWA+54DaGdLo1hMPJNRKUlQavDkrED+NgojC7ukmk7ObA5yebzVcDA/XIKdKKoR5K5hWqgMzbeU1vNnWFZxg35Gr+BdoA0XopRwm7PSOAUnqIkxchYoTTRW8R2Ku/u9WvZftf+4HZzb+AY1+Z4ZASHvoFrLICP6eS3Pnkme4juflWjeCByp7gBuGDBGsqEW+KAgnKL7HQMQeEpYKMQjb3pStcoyKnpcAE3v6mtqwImRJ+P/B6/jOaXaizYUskwIY7TNeGdBrI28mY+QC0KFBJ+Jkq+WTrvLMXF+4CBKzan86JwN75j4HcnQ7N2E7S9GxQMqMM0LtNsq8O1WyiMMxn+oQkt2WXODjfcjfM2+jVcZwZ9vmRRuQjDfqJ/+cgPsu9LedfeqT/r5lpRsI3TnNgIeLksic2gSbjGOK0DQACEh1sXhMPsT+QK5tLQZnBEZKydRWdnj1qJmQkqGDkS44QhYVqlkYzUU22p9Krw4bcZr1h9KlSPBljyD9g9H/dPOrhs8leSHiKhSEM4GkZyoL+6r1o4TGrRzWNoaMawYoZRC/SdKMmnnYymMhCpdkCMeClYEoTHsxbgnIa8eRmJ7Zu/af5Z15rzFXgkWC0tUxtr4kXNvLHcQZyK088suN8a667XYBq8YMmwYD/ckBrf8toVFIztZaMCwbS6JqgjyH4v48/QxYxyZqsqo6VE+h0HhR346djU0= 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: List-Subscribe: List-Unsubscribe: On 12/04/2024 08:37, Barry Song wrote: > From: Barry Song > > This helps to display the fragmentation situation of the swapfile, knowing > the proportion of how much we haven't split large folios. So far, we only > support non-split swapout for anon memory, with the possibility of > expanding to shmem in the future. So, we add the "anon" prefix to the > counter names. > > Signed-off-by: Barry Song > Cc: Chris Li > Cc: David Hildenbrand > Cc: Domenico Cerasuolo > Cc: Kairui Song > Cc: Matthew Wilcox (Oracle) > Cc: Peter Xu > Cc: Ryan Roberts > Cc: Suren Baghdasaryan > Cc: Yosry Ahmed > Cc: Yu Zhao LGTM! Reviewed-by: Ryan Roberts > --- > include/linux/huge_mm.h | 2 ++ > mm/huge_memory.c | 4 ++++ > mm/page_io.c | 1 + > mm/vmscan.c | 3 +++ > 4 files changed, 10 insertions(+) > > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > index c5beb54b97cb..b69c3b3e1436 100644 > --- a/include/linux/huge_mm.h > +++ b/include/linux/huge_mm.h > @@ -268,6 +268,8 @@ enum mthp_stat_item { > MTHP_STAT_ANON_FAULT_ALLOC, > MTHP_STAT_ANON_FAULT_FALLBACK, > MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE, > + MTHP_STAT_ANON_SWPOUT, > + MTHP_STAT_ANON_SWPOUT_FALLBACK, > __MTHP_STAT_COUNT > }; > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 21c4ac74b484..13e74724d0c3 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -557,11 +557,15 @@ static struct kobj_attribute _name##_attr = __ATTR_RO(_name) > DEFINE_MTHP_STAT_ATTR(anon_fault_alloc, MTHP_STAT_ANON_FAULT_ALLOC); > DEFINE_MTHP_STAT_ATTR(anon_fault_fallback, MTHP_STAT_ANON_FAULT_FALLBACK); > DEFINE_MTHP_STAT_ATTR(anon_fault_fallback_charge, MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE); > +DEFINE_MTHP_STAT_ATTR(anon_swpout, MTHP_STAT_ANON_SWPOUT); > +DEFINE_MTHP_STAT_ATTR(anon_swpout_fallback, MTHP_STAT_ANON_SWPOUT_FALLBACK); > > static struct attribute *stats_attrs[] = { > &anon_fault_alloc_attr.attr, > &anon_fault_fallback_attr.attr, > &anon_fault_fallback_charge_attr.attr, > + &anon_swpout_attr.attr, > + &anon_swpout_fallback_attr.attr, > NULL, > }; > > diff --git a/mm/page_io.c b/mm/page_io.c > index a9a7c236aecc..46c603dddf04 100644 > --- a/mm/page_io.c > +++ b/mm/page_io.c > @@ -217,6 +217,7 @@ static inline void count_swpout_vm_event(struct folio *folio) > count_memcg_folio_events(folio, THP_SWPOUT, 1); > count_vm_event(THP_SWPOUT); > } > + count_mthp_stat(folio_order(folio), MTHP_STAT_ANON_SWPOUT); > #endif > count_vm_events(PSWPOUT, folio_nr_pages(folio)); > } > diff --git a/mm/vmscan.c b/mm/vmscan.c > index bca2d9981c95..49bd94423961 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -1231,6 +1231,8 @@ static unsigned int shrink_folio_list(struct list_head *folio_list, > goto activate_locked; > } > if (!add_to_swap(folio)) { > + int __maybe_unused order = folio_order(folio); > + > if (!folio_test_large(folio)) > goto activate_locked_split; > /* Fallback to swap normal pages */ > @@ -1242,6 +1244,7 @@ static unsigned int shrink_folio_list(struct list_head *folio_list, > THP_SWPOUT_FALLBACK, 1); > count_vm_event(THP_SWPOUT_FALLBACK); > } > + count_mthp_stat(order, MTHP_STAT_ANON_SWPOUT_FALLBACK); > #endif > if (!add_to_swap(folio)) > goto activate_locked_split;