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 43F41C369D5 for ; Mon, 28 Apr 2025 15:45:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D19906B002F; Mon, 28 Apr 2025 11:45:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C9FF86B00AC; Mon, 28 Apr 2025 11:45:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AF3C06B00AD; Mon, 28 Apr 2025 11:45:47 -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 8EBCB6B002F for ; Mon, 28 Apr 2025 11:45:47 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id CA3811D0A35 for ; Mon, 28 Apr 2025 15:45:47 +0000 (UTC) X-FDA: 83383877934.09.760DF7B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf15.hostedemail.com (Postfix) with ESMTP id 862B1A000D for ; Mon, 28 Apr 2025 15:45:45 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="egn/Ijrn"; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf15.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745855145; a=rsa-sha256; cv=none; b=E965x/+l8FGC85yzXAzho7tCaBOouWaK0mh1+KoP1kIkoMFQQm7bgcmo9RTI1Wsh8qziYm 0ZSASoHgWN8g36yhfQM1L6nKAb3VaHEwNRBH673w+wUZDkYTotzCYClFZojfMP+kstwQr2 QAMbJT36VtDOD9CvKMnv6a+B74MKt4c= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="egn/Ijrn"; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf15.hostedemail.com: domain of npache@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745855145; 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=rYC5lCzUJr828076fhqqA1lyRrr2Ujsiu+eNA9UjptU=; b=Nqo0SRbosTWcCcYLRpIQjuJhtszefvanemWApM2npn7sWY8l3+LMy4q59zDvJ9qvOt3Wym LYQZYPJYZg6haVAfYDoPYysfXIFMgDqX1ku582BXczz+Jt6doWHmBoJvbOgOvnp+Gee34O CNxN9yoFiBPJ7jdTOynd9dzeeycIc/U= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1745855145; h=from:from: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=rYC5lCzUJr828076fhqqA1lyRrr2Ujsiu+eNA9UjptU=; b=egn/IjrnAeRCVstVWK5mtLCFQadoxilFa9KqsmVjrL88upbohuLfsY8eomtrI1hsvRA1xh D4Qvqzc1eD1o+Rs09/GMR22DLPomc6Dn7zh9u1Pri7D/PaIpOi+wRsfNo3+e5obVP5+Bfu WUbm+F8BWzdrpnLJESaE6h9ENf2GL+s= Received: from mail-yw1-f199.google.com (mail-yw1-f199.google.com [209.85.128.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-171-tQIEeNfuNzOrS57MA64uzA-1; Mon, 28 Apr 2025 11:45:43 -0400 X-MC-Unique: tQIEeNfuNzOrS57MA64uzA-1 X-Mimecast-MFC-AGG-ID: tQIEeNfuNzOrS57MA64uzA_1745855142 Received: by mail-yw1-f199.google.com with SMTP id 00721157ae682-7082ce1ea97so62440477b3.2 for ; Mon, 28 Apr 2025 08:45:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745855142; x=1746459942; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rYC5lCzUJr828076fhqqA1lyRrr2Ujsiu+eNA9UjptU=; b=cK7tOAt1W1sq3z+NrAFHiunpQ9eZKbaa0h2DcZBFCjudrQ7w9RzN0VrZDl3/dZu58I 4ZH7sNy5vThs0VUBB3BR0XSigwPKfEZS4XdkwI3PGKmMdlSWoYhVb5fnR/4xKCa/UIXf HJpWJPpDdp4UOs46UZIfxIuwbxAfpA3IxlXdog63YmrM/smzFnwzUIGSo2ZQPCf1kz9w KuJAq19KGzuiPkstSU91LmUTdZeNthC6/cfjzmUiJUmzRankiAOc+cs3OAqdWmRffTU9 9SElhgH3WbvQN31YfH/KQuXaBccQWYQ4TiHGJ3dqBBF/xd6Ep3f9E5/Uk9SEmWgek18r c8Xw== X-Gm-Message-State: AOJu0Yzbuf3fCcxuSHmT+wUVvqDMkYnqb5lxiGGm7NYlEIx+9KszjCIL iMiXRsqAepFenoakXmabmE+vrlufLzuzfMn7tbaAZP26rmzAhEOO89daw0kRP50e6Uh+dPdK7s0 0xkxXj8cWKNb+N4awc/w7LHAKScZiMqUg+QgabIzBm0mABk1A5CCCJCEHK/V1Q6GjanRrr6wqTq heK8ioi43Q7da4lWIULZvCktI= X-Gm-Gg: ASbGncu8GzzGXZM/WVjb6V0qcWKyosrlcgf9Mg2yL15d+un9qDMwlrUJ0XMBP3ltTZA QMhsCz/uGC0UhuTM0LLpZwS5AhP+LJHhQ/9qr0OUTb09DNfoW+sAJsOOxlY4eQnKb3a8pkluqu6 0q9YGr/fE= X-Received: by 2002:a05:690c:67c3:b0:700:a61d:a2f1 with SMTP id 00721157ae682-708540d9052mr161521997b3.7.1745855142302; Mon, 28 Apr 2025 08:45:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHFGFih3ozZEKsj4xm/6JhtLUCRC/M6E+ETCg/hOWn66Licdp+qRA1ykpxrKLnhfUjlB4pAeRTiinQgQqPRcl0= X-Received: by 2002:a05:690c:67c3:b0:700:a61d:a2f1 with SMTP id 00721157ae682-708540d9052mr161521327b3.7.1745855141849; Mon, 28 Apr 2025 08:45:41 -0700 (PDT) MIME-Version: 1.0 References: <20250417000238.74567-1-npache@redhat.com> <20250417000238.74567-12-npache@redhat.com> <30180bde-d813-40dd-83f4-0cc04daf6df6@linux.alibaba.com> In-Reply-To: <30180bde-d813-40dd-83f4-0cc04daf6df6@linux.alibaba.com> From: Nico Pache Date: Mon, 28 Apr 2025 09:45:14 -0600 X-Gm-Features: ATxdqUFKz94UIef8hpmrNssfBw-E2fCsLaNro0qnCT1DayYdhi5zln_WMT_m0JA Message-ID: Subject: Re: [PATCH v4 11/12] khugepaged: add per-order mTHP khugepaged stats To: Baolin Wang Cc: linux-mm@kvack.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, akpm@linux-foundation.org, corbet@lwn.net, rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, david@redhat.com, baohua@kernel.org, ryan.roberts@arm.com, willy@infradead.org, peterx@redhat.com, ziy@nvidia.com, wangkefeng.wang@huawei.com, usamaarif642@gmail.com, sunnanyong@huawei.com, vishal.moola@gmail.com, thomas.hellstrom@linux.intel.com, yang@os.amperecomputing.com, kirill.shutemov@linux.intel.com, aarcange@redhat.com, raquini@redhat.com, dev.jain@arm.com, anshuman.khandual@arm.com, catalin.marinas@arm.com, tiwai@suse.de, will@kernel.org, dave.hansen@linux.intel.com, jack@suse.cz, cl@gentwo.org, jglisse@google.com, surenb@google.com, zokeefe@google.com, hannes@cmpxchg.org, rientjes@google.com, mhocko@suse.com, rdunlap@infradead.org X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: _f3LrOilYkAjvVZaPYt_jJo0hFyy0WohPSk4xkdZz0c_1745855142 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 862B1A000D X-Stat-Signature: 1a3okaczwyq7w6dp65kbj9zudyozzimg X-HE-Tag: 1745855145-688569 X-HE-Meta: U2FsdGVkX19q7Rt0lofhnfW8c6XB++u0BK9RIqBwOzaYSPK1lqoKhI4thJeO6BAx6Hjt5zXqLvSCDgkDSq795PEZ5so0MAXcMwmc0shPe4GK0f/T2yuJuu45HTeZ0IYC+OEmbBC0HYn5EB6RiQ7UN3HS326lj2pFe+gT8qqy/HnLgZXCQitD/IEI3M5VeC7esTDHfv3+EMrIaEUylb970+yDKKR6ReltjvNDlM5htkh0iBiRtjIO5Irqfk+AsKmOmnLgE/Ql8GnvaMvMKbe8mOeKEoy0pw1AGNpT9cQ0FQEIkaI46Z1B65iWUVbwQFjTgAps4Dr8MbD8qgxWLtCHRPvBLOP64OQi3TRtMKfN40hWXN8cQdrOgiTPGNvZn2UUCAWWVLC3C8NHt2BtG2aeoBeCpK0GNOdvAShRzDfoIfD/yugt5IcMFLTE95Uo3Sfk+0+95HAAD+7wtFKNVOcK+6JDFl4VoJwdF3WCc72XZtv9wIdvy0/CyuYkP5wQyj3F7ubIglOpuVnkImR33hvax4bWOgbPYZNsrTCoeo6guEFh2kgXwZpvgsdrlKgJlSJM0ovriEjt5cBJZZ8r0fiu/ZHuEKDbpaxYzR2DluGsmiaXusfoPwU22HbgDlqlvWbbBg4mXixRcaV5hRosxZ823MyglzVz4qdx7RK4BxAfcykUuFmkntES8qlC8pSLNuw7qE2xJi7NM+ywygvKoXtzkmxxLdGwXfLl9JltXtq0YHEgsZfn/1hToq49NLx99ZyDVUWDvEap/eh3l3Q7pxJrtMDQNs/wletuZmJ/p6cCdm5K4mm78BkIMqz6/Kja5SYV71tv7Kg//OdjslT4DemrAejsmJ+nU33SbkpNEIyIrKwG3oGbNnmklADA7VydThpx4qvXh0z5o/qesSiQaVOb5qYVTYiOJ0t69k9b1hAVoZTUdIktDS8gXbyrHqe2aBepcOG2xvXRg3IJzMhid4m s6veMw+y WCuW2ogIX204j9gKEYn5glo/JiljofSxqpEpQBbNWxANR65NIvA1e7LGh9of/ULegmzOUo8px3R8WIHINfaDm33/C2jsGBVw46vOZ8iArTqBKwY/RbQsaPliHfmyTDzeRGCenKW+m17gFl15qSeaNNDBTtruJ7GFB1zzedEnnUKka0m3AYAxVGKBpu3sJ6M6jz7e+rXM1VkhZNFCmYUUdbYvBmep0ZxZJ5gVbXrkz9vkJvAEavh25BKL5ZcjoGCyUTVOl0gDNyWaFS2S4HIb631E9PwtJ4lmA3Goj8XH2ktojJpuaoyy3Ea5QPJHESwTkxjAujdnbEFsQbeYCKY+DVKpww0dKOwiKKPeAee89JEFZVhF+GdqIBN0aeA== 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 Thu, Apr 24, 2025 at 1:58=E2=80=AFAM Baolin Wang wrote: > > > > On 2025/4/17 08:02, Nico Pache wrote: > > With mTHP support inplace, let add the per-order mTHP stats for > > exceeding NONE, SWAP, and SHARED. > > > > Signed-off-by: Nico Pache > > --- > > include/linux/huge_mm.h | 3 +++ > > mm/huge_memory.c | 7 +++++++ > > mm/khugepaged.c | 16 +++++++++++++--- > > 3 files changed, 23 insertions(+), 3 deletions(-) > > > > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > > index 55b242335420..782d3a7854b4 100644 > > --- a/include/linux/huge_mm.h > > +++ b/include/linux/huge_mm.h > > @@ -139,6 +139,9 @@ enum mthp_stat_item { > > MTHP_STAT_SPLIT_DEFERRED, > > MTHP_STAT_NR_ANON, > > MTHP_STAT_NR_ANON_PARTIALLY_MAPPED, > > + MTHP_STAT_COLLAPSE_EXCEED_SWAP, > > + MTHP_STAT_COLLAPSE_EXCEED_NONE, > > + MTHP_STAT_COLLAPSE_EXCEED_SHARED, > > __MTHP_STAT_COUNT > > }; > > > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > > index 7798c9284533..de4704af0022 100644 > > --- a/mm/huge_memory.c > > +++ b/mm/huge_memory.c > > @@ -633,6 +633,10 @@ DEFINE_MTHP_STAT_ATTR(split_failed, MTHP_STAT_SPLI= T_FAILED); > > DEFINE_MTHP_STAT_ATTR(split_deferred, MTHP_STAT_SPLIT_DEFERRED); > > DEFINE_MTHP_STAT_ATTR(nr_anon, MTHP_STAT_NR_ANON); > > DEFINE_MTHP_STAT_ATTR(nr_anon_partially_mapped, MTHP_STAT_NR_ANON_PAR= TIALLY_MAPPED); > > +DEFINE_MTHP_STAT_ATTR(collapse_exceed_swap_pte, MTHP_STAT_COLLAPSE_EXC= EED_SWAP); > > +DEFINE_MTHP_STAT_ATTR(collapse_exceed_none_pte, MTHP_STAT_COLLAPSE_EXC= EED_NONE); > > +DEFINE_MTHP_STAT_ATTR(collapse_exceed_shared_pte, MTHP_STAT_COLLAPSE_E= XCEED_SHARED); > > + > > > > static struct attribute *anon_stats_attrs[] =3D { > > &anon_fault_alloc_attr.attr, > > @@ -649,6 +653,9 @@ static struct attribute *anon_stats_attrs[] =3D { > > &split_deferred_attr.attr, > > &nr_anon_attr.attr, > > &nr_anon_partially_mapped_attr.attr, > > + &collapse_exceed_swap_pte_attr.attr, > > + &collapse_exceed_none_pte_attr.attr, > > + &collapse_exceed_shared_pte_attr.attr, > > NULL, > > }; > > > > diff --git a/mm/khugepaged.c b/mm/khugepaged.c > > index 67da0950b833..38643a681ba5 100644 > > --- a/mm/khugepaged.c > > +++ b/mm/khugepaged.c > > @@ -604,7 +604,10 @@ static int __collapse_huge_page_isolate(struct vm_= area_struct *vma, > > continue; > > } else { > > result =3D SCAN_EXCEED_NONE_PTE; > > - count_vm_event(THP_SCAN_EXCEED_NONE_PTE); > > + if (order =3D=3D HPAGE_PMD_ORDER) > > + count_vm_event(THP_SCAN_EXCEED_NO= NE_PTE); > > + else > > + count_mthp_stat(order, MTHP_STAT_= COLLAPSE_EXCEED_NONE); > > goto out; > > } > > } > > @@ -633,8 +636,14 @@ static int __collapse_huge_page_isolate(struct vm_= area_struct *vma, > > /* See khugepaged_scan_pmd(). */ > > if (folio_maybe_mapped_shared(folio)) { > > ++shared; > > - if (order !=3D HPAGE_PMD_ORDER || (cc->is_khugepa= ged && > > - shared > khugepaged_max_ptes_shared)) { > > + if (order !=3D HPAGE_PMD_ORDER) { > > + result =3D SCAN_EXCEED_SHARED_PTE; > > + count_mthp_stat(order, MTHP_STAT_COLLAPSE= _EXCEED_SHARED); > > + goto out; > > + } > > + > > + if (cc->is_khugepaged && > > + shared > khugepaged_max_ptes_shared) { > > result =3D SCAN_EXCEED_SHARED_PTE; > > count_vm_event(THP_SCAN_EXCEED_SHARED_PTE= ); > > goto out; > > @@ -1060,6 +1069,7 @@ static int __collapse_huge_page_swapin(struct mm_= struct *mm, > > > > /* Dont swapin for mTHP collapse */ > > if (order !=3D HPAGE_PMD_ORDER) { > > + count_mthp_stat(order, MTHP_STAT_COLLAPSE_EXCEED_= SHARED); > > Should be MTHP_STAT_COLLAPSE_EXCEED_SWAP? Yes! Thank you, I will fix this :) > > > result =3D SCAN_EXCEED_SWAP_PTE; > > goto out; > > } >