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 E9AC6E68945 for ; Thu, 31 Oct 2024 01:35:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6C7526B009B; Wed, 30 Oct 2024 21:35:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6034F6B009C; Wed, 30 Oct 2024 21:35:30 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 47B9A6B009E; Wed, 30 Oct 2024 21:35:30 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 20CDB6B009B for ; Wed, 30 Oct 2024 21:35:30 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id BFE32ACF2F for ; Thu, 31 Oct 2024 01:35:29 +0000 (UTC) X-FDA: 82732178676.03.2525566 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by imf24.hostedemail.com (Postfix) with ESMTP id C277E180013 for ; Thu, 31 Oct 2024 01:35:22 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=lUi6ln+u; spf=pass (imf24.hostedemail.com: domain of ying.huang@intel.com designates 192.198.163.13 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730338314; 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:dkim-signature; bh=orpmPvOdEZi1H7szi8Y06mMYT9cCuXUq1Ql8byRRHbM=; b=sAeAPBc8FP329WirwPxD+/R7e5oyXcHI6OmzeT/sONKf80VkRxxbnX4CqN8alPCuorvSs/ ssUMkb2kSkGjolPusu8ZFXrcg2Hv5eGk6rmteRCB0M1gEA2w1mHxbGdp2GX/E5l0IoMnnI byNfPk6Ss2LzXyFmcQ6VP40YhIVXoqI= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=lUi6ln+u; spf=pass (imf24.hostedemail.com: domain of ying.huang@intel.com designates 192.198.163.13 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730338314; a=rsa-sha256; cv=none; b=5JwIEZvRCbBbRX3bGRZmvK8H4RXU7GW9McSF6t5vSU+WGOWfkKhFaicanVrT+3EbvX1Lx/ mgLnrJ1Hlca2RdDsgvEVQ/dfBCzrakQAfjSEuE3VkpXWwAi3CyPBn9Oyph1yxK4KC78l+N c2x0rzf8nlM2TpFPVAUWmhZ/t+C6Ddw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1730338526; x=1761874526; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version:content-transfer-encoding; bh=WuF36lZjHaYlPv9BbCV28pQgEqIcnbHQ6qVMkSkkZmY=; b=lUi6ln+uuiF+5DRPuihcqtmBlzNOvMuSVZSp4JKM2vVzxvwVK04wcRGs FWJ+4tsVUCzZlW57gD2Fp5xjoC8NMCUo7l8Xol+ZBKhm52U4tr6h0hqsY itowj4Lb4N2HcCov1QVJBo8RAmKaCcvLAho05kUtEsFUUwzo68DJ89rVn FYa9aPYQQzZ1Uy/G2aHZkTctd7M5mme8vjbduS8mTK8vDXMhlrDF53i4w UFL22mwEONGzTqmVjX1jCKmyZQATsZsSg52stePTjA5XFdFqCNgvuURM2 k3l6dvCf7lWWfTK7FsCnMywiEFoBV+jx7XgSq1J9sLuu5ct4hdYD+H8qQ A==; X-CSE-ConnectionGUID: QyYuvFBwQXKbF8GYnZbw5g== X-CSE-MsgGUID: zXTupx8cTCaV/2n5iUwFEA== X-IronPort-AV: E=McAfee;i="6700,10204,11241"; a="32905323" X-IronPort-AV: E=Sophos;i="6.11,246,1725346800"; d="scan'208";a="32905323" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Oct 2024 18:35:25 -0700 X-CSE-ConnectionGUID: wHR1di9uTNG5o719ddQRoA== X-CSE-MsgGUID: UJv52kH3So2KKh/nVFQeDQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,246,1725346800"; d="scan'208";a="87088100" Received: from yhuang6-desk2.sh.intel.com (HELO yhuang6-desk2.ccr.corp.intel.com) ([10.238.208.55]) by fmviesa004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Oct 2024 18:35:21 -0700 From: "Huang, Ying" To: Barry Song <21cnbao@gmail.com> Cc: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Barry Song , Baolin Wang , David Hildenbrand , Chris Li , Yosry Ahmed , Kairui Song , Ryan Roberts , Kanchana P Sridhar , Usama Arif Subject: Re: [PATCH v2] mm: add per-order mTHP swpin counters In-Reply-To: (Barry Song's message of "Thu, 31 Oct 2024 14:13:04 +1300") References: <20241030233423.80759-1-21cnbao@gmail.com> <87cyjh9khr.fsf@yhuang6-desk2.ccr.corp.intel.com> Date: Thu, 31 Oct 2024 09:31:49 +0800 Message-ID: <878qu59hx6.fsf@yhuang6-desk2.ccr.corp.intel.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: C277E180013 X-Stat-Signature: u8xeqt5cshto6tianxa7yaemodmk6xc1 X-Rspam-User: X-HE-Tag: 1730338522-10160 X-HE-Meta: U2FsdGVkX1+7Y5OWpYf5K0mZ+6k8U1UyJ6K5bY6E9B7oG6CXsphVmjzg5G+3YmoWQ7N9jaA1siu88qEV/yTI31Rof+QKmSv9rTM16Op8QYCaxkJDJUzDzuSl1iHvg8KLm0a3EVv9F+EBETbJhhjdioza20RICmcix65I3yXQrKz/4B1/SgZFRhgF4ToJBfRYZVP+u4udpNi6+kN7PD2LThc+wOHE899Mqhp2+01hfUPBebFHBg1ZaL6reNqABTiY+S4i30fUdS5s2PQvIjbXDoLcz/FD3oPuD+5Hdokxn7uGvVOGu55Lqyd3p9sI1OMdbK8foguAp5sMJyzMnu//tLPWPLjj3XzIlyoNorU0LJDaIvR2AoemmtqWtycSCeRWPp/WZRSpOoAth5O1iXBQFmaF8PBfQ/Hl2EJTJLVYE7FLhYKjrwOh4FdEReiYcPmK2O9ctYRy86GZ8YODCr6YbZnTxKaEeppGhDNK4lSujqhC+vtgr4D+48Mkp12anV/dq7cZZrCiLCqZUSavfNePTu1V68oSECFcXXyNcJSUGQAMpkx1X4cWP1Zyho38EXcQL8+LdrbQyNy7Y9kjBW1kjQT8Op/o1GbPrW4RKvIuBqeBdDExJWjM41UGmZul9EsoXokVRyxDns24u1qXYFz6z80CnTDDI3jrtJyaUVJHqqBd3f7mIx0mlNQkcjJX0bEMLYQm1ZI365gG01oIWC/KHuuDFYT3YFj52OuevFXwvBgmizgSi1SR7/WctO0Qie6k8MpB6M63uvv61rynU+Bmrmw/FxxBCP/Zq+VCDbk6KwKrhH8dm+nXQm10XiQlqy+O5pTW7Uas0MRWAlp+LJbreflIFE/8kf/2GR/UfYDvsMDNV0afZef0WzH0NL/UYVwz2V0ketJIAUFspaxDroAuPiVcrYrbgJ1HPw3fTRkonVp4n9+PChTDUc/JXpOv+4qm11C1ojIz2hFHbRI4k3h ViGsgOde RJgSR+x8nW2lxseVCcN70TKUrCv/BvhUV+SPJHqrgE1Cngja5SPOq3HdJ1HlkzALE4aN0GFJvgJ6s+kGtZFKYgy26x7I/s5KShVLnn+BgmWhJpMv7fmpyKFGmiSlsqBKd5OsH3Ic0SLswvBBiZfvD5iYUVvqER0W9CSrijQvs+pkk4SpLcevD1pf97vD9LNoL5Qbn8Asdujy4vzRyNxKDYf/uKgucu8zscbkm+hEcnhRth1IsVgiN83fszD9JpDrM6Yeze1JuLpeJeRFETyM6etiDs81cfq6Vma6gZ/yR2NCyqZVQy3ttTqh81gNPUT5J8ag2T4hd3b86jzAr5ze8RMkWdDSmN63gzAx5J3JnrPReCwX9VDkuo0o1U1L/H+D0SoiZjeWW/JODloHsh6kCCVuO1EeeLNRuo90H 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: Barry Song <21cnbao@gmail.com> writes: > On Thu, Oct 31, 2024 at 1:39=E2=80=AFPM Huang, Ying wrote: >> >> Barry Song <21cnbao@gmail.com> writes: >> >> > From: Barry Song >> > >> > This helps profile the sizes of folios being swapped in. Currently, >> > only mTHP swap-out is being counted. >> > The new interface can be found at: >> > /sys/kernel/mm/transparent_hugepage/hugepages-/stats >> > swpin >> >> This looks strange, why isn't it >> >> /sys/kernel/mm/transparent_hugepage/hugepages-/stats/swpin >> >> ? > > I might be mistaken, but I want to highlight the path and new interface > separately, as I=E2=80=99ve done in ec33687c67493 ("mm: add per-order mTHP > anon_fault_alloc and anon_fault_fallback counters"): > > If you prefer it on the same line, I=E2=80=99m completely fine with sendi= ng v3 > to make the change. I am fine to highlight the new interface. May be something like In /sys/kernel/mm/transparent_hugepage/hugepages-/stats, 'swpin' is added for ... However, I have no strong opinion here. If everyone except me feels confusing, that should be fine. >> >> > For example, >> > cat /sys/kernel/mm/transparent_hugepage/hugepages-64kB/stats/swpin >> > 12809 >> > cat /sys/kernel/mm/transparent_hugepage/hugepages-32kB/stats/swpin >> > 4763 >> >> You miss "$"? > > Yes. > >> >> $ cat /sys/kernel/mm/transparent_hugepage/hugepages-64kB/stats/swpin >> 12809 >> $ cat /sys/kernel/mm/transparent_hugepage/hugepages-32kB/stats/swpin >> 4763 >> >> > Signed-off-by: Barry Song >> > Reviewed-by: Baolin Wang >> > Acked-by: David Hildenbrand >> > Cc: Chris Li >> > Cc: Yosry Ahmed >> > Cc: "Huang, Ying" >> > Cc: Kairui Song >> > Cc: Ryan Roberts >> > Cc: Kanchana P Sridhar >> > Cc: Usama Arif >> > --- >> > -v2: >> > * collect Baolin's reviewed-by and David's acked-by, thanks! >> > * add some examples for the interface in the changelog, Per >> > Huang, Ying. thanks! >> > * add a blank line in doc which was missed in v1. >> > >> > Documentation/admin-guide/mm/transhuge.rst | 4 ++++ >> > include/linux/huge_mm.h | 1 + >> > mm/huge_memory.c | 3 +++ >> > mm/page_io.c | 3 +++ >> > 4 files changed, 11 insertions(+) >> > >> > diff --git a/Documentation/admin-guide/mm/transhuge.rst b/Documentatio= n/admin-guide/mm/transhuge.rst >> > index 2a171ed5206e..5caa3fb2feb1 100644 >> > --- a/Documentation/admin-guide/mm/transhuge.rst >> > +++ b/Documentation/admin-guide/mm/transhuge.rst >> > @@ -534,6 +534,10 @@ zswpout >> > is incremented every time a huge page is swapped out to zswap in= one >> > piece without splitting. >> > >> > +swpin >> > + is incremented every time a huge page is swapped in from a non-z= swap >> > + swap device in one piece. >> > + >> > swpout >> > is incremented every time a huge page is swapped out to a non-zs= wap >> > swap device in one piece without splitting. >> > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h >> > index c59e5aa9b081..b94c2e8ee918 100644 >> > --- a/include/linux/huge_mm.h >> > +++ b/include/linux/huge_mm.h >> > @@ -120,6 +120,7 @@ enum mthp_stat_item { >> > MTHP_STAT_ANON_FAULT_FALLBACK, >> > MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE, >> > MTHP_STAT_ZSWPOUT, >> > + MTHP_STAT_SWPIN, >> > MTHP_STAT_SWPOUT, >> > MTHP_STAT_SWPOUT_FALLBACK, >> > MTHP_STAT_SHMEM_ALLOC, >> > diff --git a/mm/huge_memory.c b/mm/huge_memory.c >> > index b26c6503e993..f92068864469 100644 >> > --- a/mm/huge_memory.c >> > +++ b/mm/huge_memory.c >> > @@ -616,6 +616,7 @@ DEFINE_MTHP_STAT_ATTR(anon_fault_alloc, MTHP_STAT_= ANON_FAULT_ALLOC); >> > DEFINE_MTHP_STAT_ATTR(anon_fault_fallback, MTHP_STAT_ANON_FAULT_FALLB= ACK); >> > DEFINE_MTHP_STAT_ATTR(anon_fault_fallback_charge, MTHP_STAT_ANON_FAUL= T_FALLBACK_CHARGE); >> > DEFINE_MTHP_STAT_ATTR(zswpout, MTHP_STAT_ZSWPOUT); >> > +DEFINE_MTHP_STAT_ATTR(swpin, MTHP_STAT_SWPIN); >> > DEFINE_MTHP_STAT_ATTR(swpout, MTHP_STAT_SWPOUT); >> > DEFINE_MTHP_STAT_ATTR(swpout_fallback, MTHP_STAT_SWPOUT_FALLBACK); >> > #ifdef CONFIG_SHMEM >> > @@ -635,6 +636,7 @@ static struct attribute *anon_stats_attrs[] =3D { >> > &anon_fault_fallback_charge_attr.attr, >> > #ifndef CONFIG_SHMEM >> > &zswpout_attr.attr, >> > + &swpin_attr.attr, >> > &swpout_attr.attr, >> > &swpout_fallback_attr.attr, >> > #endif >> > @@ -666,6 +668,7 @@ static struct attribute_group file_stats_attr_grp = =3D { >> > static struct attribute *any_stats_attrs[] =3D { >> > #ifdef CONFIG_SHMEM >> > &zswpout_attr.attr, >> > + &swpin_attr.attr, >> > &swpout_attr.attr, >> > &swpout_fallback_attr.attr, >> > #endif >> > diff --git a/mm/page_io.c b/mm/page_io.c >> > index c69fab5060a1..5d9b6e6cf96c 100644 >> > --- a/mm/page_io.c >> > +++ b/mm/page_io.c >> > @@ -487,6 +487,7 @@ static void sio_read_complete(struct kiocb *iocb, = long ret) >> > for (p =3D 0; p < sio->pages; p++) { >> > struct folio *folio =3D page_folio(sio->bvec[p].= bv_page); >> > >> > + count_mthp_stat(folio_order(folio), MTHP_STAT_SW= PIN); >> > count_memcg_folio_events(folio, PSWPIN, folio_nr= _pages(folio)); >> > folio_mark_uptodate(folio); >> > folio_unlock(folio); >> > @@ -573,6 +574,7 @@ static void swap_read_folio_bdev_sync(struct folio= *folio, >> > * attempt to access it in the page fault retry time check. >> > */ >> > get_task_struct(current); >> > + count_mthp_stat(folio_order(folio), MTHP_STAT_SWPIN); >> > count_memcg_folio_events(folio, PSWPIN, folio_nr_pages(folio)); >> > count_vm_events(PSWPIN, folio_nr_pages(folio)); >> > submit_bio_wait(&bio); >> > @@ -589,6 +591,7 @@ static void swap_read_folio_bdev_async(struct foli= o *folio, >> > bio->bi_iter.bi_sector =3D swap_folio_sector(folio); >> > bio->bi_end_io =3D end_swap_bio_read; >> > bio_add_folio_nofail(bio, folio, folio_size(folio), 0); >> > + count_mthp_stat(folio_order(folio), MTHP_STAT_SWPIN); >> > count_memcg_folio_events(folio, PSWPIN, folio_nr_pages(folio)); >> > count_vm_events(PSWPIN, folio_nr_pages(folio)); >> > submit_bio(bio); >> -- Best Regards, Huang, Ying