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 F1F36C27C53 for ; Wed, 12 Jun 2024 13:46:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 80DCD6B009A; Wed, 12 Jun 2024 09:46:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7BBFE6B009B; Wed, 12 Jun 2024 09:46:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6841D6B009C; Wed, 12 Jun 2024 09:46:27 -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 484C76B009A for ; Wed, 12 Jun 2024 09:46:27 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id AF7D1A1683 for ; Wed, 12 Jun 2024 13:46:26 +0000 (UTC) X-FDA: 82222361172.07.B592D15 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf07.hostedemail.com (Postfix) with ESMTP id D8AE04001A for ; Wed, 12 Jun 2024 13:46:23 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf07.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718199984; 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=yIzeFQbvjDO0qSVHMgsFna+e5lTbAvjjJhYLHs/bWts=; b=lNT+Znm9sTltX5yK6cpYX/Qz1qFigEEcH8SjTVr99pATy5hc0L5OsKoSd0XXGqJksXud7I Q97nkWZ+/NC+iGe36S06SvMp55R3GIdYNfeZHPByt9XvuOxqhuZ1jV4bQxBDzHdEmfGvaZ N+NMX/5VeLAIXhJtTgI8n32K0bVtTVU= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf07.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718199984; a=rsa-sha256; cv=none; b=Fa6zYatnmZ6ZS3LEEjVlXegitES50mUuUH4xfCEwvidT+n6K9XquoxKbUNutPw3S4qlew2 lCz/YochyEOFEXv0dH5gRowv1MmoGxpvhZusurSETdEp6Jz5efxVIl84sVVFjC25c4vICs olF2LNNuc//KOj472duZCFwO/Bm7Ypg= Received: from mail.maildlp.com (unknown [172.19.163.252]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4VzmtZ3VDyzxSRP; Wed, 12 Jun 2024 21:42:14 +0800 (CST) Received: from dggpemf100008.china.huawei.com (unknown [7.185.36.138]) by mail.maildlp.com (Postfix) with ESMTPS id 0EAB118007A; Wed, 12 Jun 2024 21:46:19 +0800 (CST) Received: from [10.174.177.243] (10.174.177.243) by dggpemf100008.china.huawei.com (7.185.36.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Wed, 12 Jun 2024 21:46:18 +0800 Message-ID: Date: Wed, 12 Jun 2024 21:46:17 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 6/6] mm: shmem: add mTHP counters for anonymous shmem Content-Language: en-US To: Baolin Wang , , CC: , , , <21cnbao@gmail.com>, , , , , , , , References: <4fd9e467d49ae4a747e428bcd821c7d13125ae67.1718090413.git.baolin.wang@linux.alibaba.com> From: Kefeng Wang In-Reply-To: <4fd9e467d49ae4a747e428bcd821c7d13125ae67.1718090413.git.baolin.wang@linux.alibaba.com> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.174.177.243] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To dggpemf100008.china.huawei.com (7.185.36.138) X-Rspamd-Queue-Id: D8AE04001A X-Stat-Signature: smzgpmqjehfxr8yywz9sa98r1c8n9nhg X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1718199983-23572 X-HE-Meta: U2FsdGVkX1/MvkCrL5L+zhnv44PhhZEPtnJqt0LbiFfgxc0D70jGWPpRB9SYThrzgB2YT/HnQLejTG5hDxzXIc0Mn7hcV2+q/J+bdI6xDCCaMhEUmY4QcxpcBNSL4WVRk2dz2HH3u2I6iIFb3wudK/W851AP82mFqYBqdikHzCLdxOIMO/xj8FCNxRUDIpZRWohVsAnebsk05YspOBDpKUgbIbTMXKiNYSSoh1IZ6JEJeyB+aM1RmCFCqMbrv1Xkl8Z7t76v4G1P2cgypDfuYt4qKa/qRjVWZVLGyTwK0E9b/rXfdutKAeDdllmpEpZUB5BONFarxqrn6uFFsY5FknSWqSt2DntMir9zeQoB3AxwtIA7rKQ/UuqgFTrzcBm+2VAW+FmFET/LyG4NwutYR+3fvxuEE/ylBJ0Hyo04G78cQaHL6OUmsuY0wYRrwlUHQsK8CNd53UzMJ9mlauuY90x4DaMmmiUVLA4kO4n4SyoCcs8MRQgZPXgAuRA0pcD1/nOOvtOXrqrf2uhmvcLIUX//KBq6yJxCeiKj7G4wlSiNH8+QSpmnUxOWuIPCm7oGOa96kyHVRhlYSS0ZQuYru6Kt835ryrVNEwNTh2o9qzQcq7sc8gw08WU0ZwXvYkXJS4oMGguXa1/OXhdaTufScpkhVTBwFEZHpvkzxLI5ekdA92iQjD3tb5R4T9oqspWmBxxu6TMFbLf1yi20U2CY7NSRTRSZV+XrUSGbp6IoQhFQbS25My5hNdO0OyKkd/s/C61Q97kpMQUYOWTy/v2dy33ucDK58EtJ0+7sEYwHHnpr9e2lVNpViJifHs3BsTlvI8O/KDdVe5fiU4MSDammCu6u9r0JSG/leIpF/6lpgNZt+GkOdqIdy3v+TOkKZfkMMxO7adu9JJ1kxGYO04Y/3Aqe382GiPQoNP9P0tzWJ6D3KLotoqBm7v2Hfy/AEWA5UCJOT73fE1QpQHvIEUH kFdzwQxx FH/nWQW8saNLF4m3SlY15TFUAZV4TwRTgFkvAWKGQeD13BmiAaMi1Mv0scy5i3zFlsDKLDh57dFBfzDGiQzgknrsP7DiVfS3LBKrNCKqaplFlxO62QAHPQDRSnLDeQUX14kvZIRMOJdpTx07KxB8F7esQJKtwZOX02ozQgp464k8SW1Fd6Ke5FtJUDYh4f8q/XvZTzx8VjkmJYEU7DY3bdNDY5ywq+0HQB70lj2fiFGHI/9I= 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 2024/6/11 18:11, Baolin Wang wrote: > Add mTHP counters for anonymous shmem. > > Signed-off-by: Baolin Wang > --- > include/linux/huge_mm.h | 3 +++ > mm/huge_memory.c | 6 ++++++ > mm/shmem.c | 18 +++++++++++++++--- > 3 files changed, 24 insertions(+), 3 deletions(-) > > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > index 909cfc67521d..212cca384d7e 100644 > --- a/include/linux/huge_mm.h > +++ b/include/linux/huge_mm.h > @@ -281,6 +281,9 @@ enum mthp_stat_item { > MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE, > MTHP_STAT_SWPOUT, > MTHP_STAT_SWPOUT_FALLBACK, > + MTHP_STAT_FILE_ALLOC, > + MTHP_STAT_FILE_FALLBACK, > + MTHP_STAT_FILE_FALLBACK_CHARGE, > __MTHP_STAT_COUNT > }; > > diff --git a/mm/huge_memory.c b/mm/huge_memory.c > index 1360a1903b66..3fbcd77f5957 100644 > --- a/mm/huge_memory.c > +++ b/mm/huge_memory.c > @@ -555,6 +555,9 @@ 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(swpout, MTHP_STAT_SWPOUT); > DEFINE_MTHP_STAT_ATTR(swpout_fallback, MTHP_STAT_SWPOUT_FALLBACK); > +DEFINE_MTHP_STAT_ATTR(file_alloc, MTHP_STAT_FILE_ALLOC); > +DEFINE_MTHP_STAT_ATTR(file_fallback, MTHP_STAT_FILE_FALLBACK); > +DEFINE_MTHP_STAT_ATTR(file_fallback_charge, MTHP_STAT_FILE_FALLBACK_CHARGE); > > static struct attribute *stats_attrs[] = { > &anon_fault_alloc_attr.attr, > @@ -562,6 +565,9 @@ static struct attribute *stats_attrs[] = { > &anon_fault_fallback_charge_attr.attr, > &swpout_attr.attr, > &swpout_fallback_attr.attr, > + &file_alloc_attr.attr, > + &file_fallback_attr.attr, > + &file_fallback_charge_attr.attr, > NULL, > }; > > diff --git a/mm/shmem.c b/mm/shmem.c > index f5469c357be6..99bd3c34f0fb 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -1773,6 +1773,9 @@ static struct folio *shmem_alloc_and_add_folio(struct vm_fault *vmf, > > if (pages == HPAGE_PMD_NR) > count_vm_event(THP_FILE_FALLBACK); > +#ifdef CONFIG_TRANSPARENT_HUGEPAGE > + count_mthp_stat(order, MTHP_STAT_FILE_FALLBACK); > +#endif > order = next_order(&suitable_orders, order); > } > } else { > @@ -1792,9 +1795,15 @@ static struct folio *shmem_alloc_and_add_folio(struct vm_fault *vmf, > if (xa_find(&mapping->i_pages, &index, > index + pages - 1, XA_PRESENT)) { > error = -EEXIST; > - } else if (pages == HPAGE_PMD_NR) { > - count_vm_event(THP_FILE_FALLBACK); > - count_vm_event(THP_FILE_FALLBACK_CHARGE); > + } else if (pages > 1) { > + if (pages == HPAGE_PMD_NR) { > + count_vm_event(THP_FILE_FALLBACK); > + count_vm_event(THP_FILE_FALLBACK_CHARGE); > + } > +#ifdef CONFIG_TRANSPARENT_HUGEPAGE > + count_mthp_stat(folio_order(folio), MTHP_STAT_FILE_FALLBACK); > + count_mthp_stat(folio_order(folio), MTHP_STAT_FILE_FALLBACK_CHARGE); pages > 1, we have correct order, count_mthp_stat(order, MTHP_XXX) ? > +#endif > } > goto unlock; > } > @@ -2168,6 +2177,9 @@ static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index, > if (!IS_ERR(folio)) { > if (folio_test_pmd_mappable(folio)) > count_vm_event(THP_FILE_ALLOC); > +#ifdef CONFIG_TRANSPARENT_HUGEPAGE > + count_mthp_stat(folio_order(folio), MTHP_STAT_FILE_ALLOC); > +#endif > goto alloced; > } > if (PTR_ERR(folio) == -EEXIST)