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 19AEFC27C53 for ; Thu, 13 Jun 2024 01:00:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 827306B0096; Wed, 12 Jun 2024 21:00:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7D6676B0098; Wed, 12 Jun 2024 21:00:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6C5346B0099; Wed, 12 Jun 2024 21:00:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 4F1466B0096 for ; Wed, 12 Jun 2024 21:00:57 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id E915314145A for ; Thu, 13 Jun 2024 01:00:56 +0000 (UTC) X-FDA: 82224060912.15.961473F Received: from out30-124.freemail.mail.aliyun.com (out30-124.freemail.mail.aliyun.com [115.124.30.124]) by imf27.hostedemail.com (Postfix) with ESMTP id 5E1D440024 for ; Thu, 13 Jun 2024 01:00:54 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=OreWM1oc; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf27.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.124 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718240454; 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=aAWlJ3M4tOKjB01RLyyTgaKsXtqHNDmd0vljFJx8Ors=; b=DMFyniRf6BeNeU4OBw8B8N/kcVarMZrpHZna3ZcDdlgzt0Mb74+OsKAxa7HnNJrJAgLBKb 1rCt7UexXTMzJ3ZACpT2u55piCYbmykC61rxZhggine/QlLKmkvMGDd7cx2ppwZtZF4A/P ycRfYDIH31rwNSacexx0+pMYrL9jYB0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718240454; a=rsa-sha256; cv=none; b=elaqx/hUW5mtNt8BkwiQS1iMFQ9+JO5YflXqnAv2qt+XlePi3xr7D3RiEu2JHi85UarOhw gqrOOcstDxsYQFUvesREDfsyfqKknZqP9oBBYyiaXNHqbkthH5fvtN1WzPb4Zy8a0rhXbx 73X5+EkZL11ACXY0vx7UlzlzhmlxLus= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=OreWM1oc; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf27.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.124 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1718240451; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=aAWlJ3M4tOKjB01RLyyTgaKsXtqHNDmd0vljFJx8Ors=; b=OreWM1oc/Kwb/qtWhjMSHV5eRW4nJ5Tx9CcDr74wKMJU6tl+K2jrsIhdFLbZXFX0jIW8T6J4ZCySj3JBCCfk5WthuSX2umL2+XczdoV09vWtgPBg+gOunY90iyposlHK43jPe6Umnll5MAkCCCOCYdZBXApCRf2a0cvY1IWrgO4= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R271e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033045075189;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=15;SR=0;TI=SMTPD_---0W8M4Sn5_1718240449; Received: from 30.97.56.57(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W8M4Sn5_1718240449) by smtp.aliyun-inc.com; Thu, 13 Jun 2024 09:00:50 +0800 Message-ID: Date: Thu, 13 Jun 2024 09:00:48 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 6/6] mm: shmem: add mTHP counters for anonymous shmem To: Kefeng Wang , akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, ying.huang@intel.com, 21cnbao@gmail.com, ryan.roberts@arm.com, shy828301@gmail.com, ziy@nvidia.com, ioworker0@gmail.com, da.gomez@samsung.com, p.raghav@samsung.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <4fd9e467d49ae4a747e428bcd821c7d13125ae67.1718090413.git.baolin.wang@linux.alibaba.com> From: Baolin Wang In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 5E1D440024 X-Stat-Signature: mp7oykc9ga93fz6yfb31fchtz9bxxh9b X-Rspam-User: X-HE-Tag: 1718240454-541325 X-HE-Meta: U2FsdGVkX1/SssV2hxlPvYd3mpXmFowcHMsvEUf5XbFiJnEK1m4rOmA7kAG7qTMLNYbOgV95leWGtuTxGLbKUpuWUnq7QY52cOt2QOVmRa+ZFZ0zxKljioRsbvDohdLU3fnPlNopX5PZC60ydBSpt4vlPH1UbrOs1wEKAM66b+//BXrEEOvgrPDR1KwPNor9otgbr9O0SZ6uPeQquYxsAuh2xgXZOQNQLinxcGagZ/Tve7XtSyjInOdKlj4qgY8lLU2Hd+NWxAerJwNYUwErL/Ql7R1ylm+wUGy1zHhOIymdQD2pO8hnIuIEzJciaxLe0w+aJ5wIFTMPpTEpamRD7kmhfN8md3+6whCKV/7sc5+Ov/LznO1I4+fXAdvXo9L760t9owBzvS5OzFI42H5zBbwNZgXmyyOEkthtQAYtQg/fkutYJSkDBAP9lV8mk3NWUVtpiPf3o/urTIWhCdZUpkTrf36d7EKwJr8XqhTfkiJ/CHxWNU0dS499/31J/5on2Zc7lglw4REEzBAvtk6mmL5yh5pbFwpCCkwm9Z0CSRqcaZwm8TldyvUh9uqihf7R3pd1Oqu5T4Fm+2XJWZ0kPOfZQ5mRHbkOeUlG/Wx5egG5wm6wfW76Va/nEerhO3mhol4jM4KhXYnVOq+VE+dVHOZ+Z+yGG6xKInPe3LniOGuSNs0rCxkcIow3x6MlK4oKTeyO+BWWtyJ8brCEAqbmaqkkBAIHwlz2hiC+XMacpABs1O4pH8S83Uyi8ZzMusNaGmrzN6veSn1iTuV9iSxJTY/AUBEnmf5E9MYS/2GZiHzJgLzyFFqo+FM6eNsAyYmb/4M14B4+v8A+qYWpTfK4jDFbo0742uVE7Lygd4F83anSKlw2n41yRt3bleM8xpYYEyBFO3fS5fK7eqFSnHCri2BM1EFgwDKBg3vJrohJUHXJYSxse9JvWReSPSA51gS8LY3X0dw5KSLq5kUTmYG XmSzySrT gO9oaMjXQlax4jFCIocVsGsqViYtSY3DyQ1Ps5vUgNsTeC+hMaZqt8cDhFhy11eG718+j45ujfWlJ3SaKtp6LQdLidjciOqWAN0ZenWWvEJWttRMsgfX8kjdhP2jd72LYVnLJYD6MhmfpdiBF4Hf0A84UaNjYXgwEY/F1n+7ZHN945Xm+f1nRHHKs41dAPJontb71ALBpKNeH/TSunw2fsMFtU8xwOVHU6s7x/chofZT/om/DwQfL6ifv+Pna0fG07z2eS89+kPSq2rNVWPCUuuuI5aUTHXHnFeJRvpaOj48+I5XrFZ0HCYhQC8XChGDs/7oASOv12L1HfXD9iTNM34xwFXF36/UJmLSe 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/12 21:46, Kefeng Wang wrote: > > > 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) ? Yes, I can use 'order' instead if a new version is needed.