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 5627DC04FFE for ; Wed, 15 May 2024 03:14:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C9BD08D0069; Tue, 14 May 2024 23:14:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C4BEC8D004F; Tue, 14 May 2024 23:14:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B3A058D0069; Tue, 14 May 2024 23:14:18 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 969928D004F for ; Tue, 14 May 2024 23:14:18 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 526CD16132C for ; Wed, 15 May 2024 03:14:18 +0000 (UTC) X-FDA: 82119161796.15.12DD3B8 Received: from out30-119.freemail.mail.aliyun.com (out30-119.freemail.mail.aliyun.com [115.124.30.119]) by imf18.hostedemail.com (Postfix) with ESMTP id 32A101C0006 for ; Wed, 15 May 2024 03:14:15 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=Sm7Jg0zX; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf18.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.119 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=1715742856; 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=UJuzwdjUXcXXpYmOq4Y06/gX6rCmcwYb4f6sZ0kESE0=; b=PldlLqfzP7Eba+O2T5i8LNYUF8myxvYcPj5B8ihfpBIv4b0Xp6YRBrUUW59VhZ/SeTpxb+ QN+IdtsSHnwZIz9tkHTmA5zaYxsUOhjORff9Ypks/eLdEh4LdJzRKB7vnHiMNiDU4PfOy3 alyDE9pMLTv5JV2KbiQ24D/XWZqwzrg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715742856; a=rsa-sha256; cv=none; b=lipr6lvFp9LFt5h+qfoBY6Q9ESf/TslFn+zWr05u+417oBWYcl/wrIq2KurTb6PG3Yoy+3 eG6ZYzl3w8ukUqB+w50KDddTi0yGWPEoNNbQZcs15VXB175vy51cmSAQX58psiAYTEN5L4 foMjt4oIE70mgdH+fZDHggeau+eMggQ= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=Sm7Jg0zX; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf18.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.119 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=1715742853; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=UJuzwdjUXcXXpYmOq4Y06/gX6rCmcwYb4f6sZ0kESE0=; b=Sm7Jg0zX3Oy34tc8KZ3XQAHzCSvNgYqleesSL65IckWfyUQel41H3mtxsANPlM5xWUJB90RlNC1jUYb881El1QRXJAnMhmE4wRAQFqwNlLdy3wPvAkuUHW183Gz00FU+xqViO2nWRI56UpSz2amRk51xQ4AE9KowYx4sYd33+os= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R781e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033068173054;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=13;SR=0;TI=SMTPD_---0W6WW.n8_1715742850; Received: from 30.97.56.58(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W6WW.n8_1715742850) by smtp.aliyun-inc.com; Wed, 15 May 2024 11:14:11 +0800 Message-ID: Date: Wed, 15 May 2024 11:14:10 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 7/7] mm: shmem: add mTHP counters for anonymous shmem To: Lance Yang Cc: akpm@linux-foundation.org, hughd@google.com, willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, ying.huang@intel.com, 21cnbao@gmail.com, ryan.roberts@arm.com, shy828301@gmail.com, ziy@nvidia.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org References: From: Baolin Wang In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Stat-Signature: k4czf7nqydqjjdyx1azxe3tyon3zjs1w X-Rspamd-Queue-Id: 32A101C0006 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1715742855-879632 X-HE-Meta: U2FsdGVkX1/O0KxiDFA1WgEGQzaTTBN4YXR72vCJ7+VwZJoZwT/WdGFQT46b3+Moqk9lANbHW0iYboWIhyyuQtJYrClNCA8TwP3oEHu2wJXr/KjJNjvXpu05eJ7YWNfNQU85tcKiy+4VaWHe494tsi7Vbl7xaQPEmZrLZ9A6IxsoaR3LxPaB3WEGjezlMLzGCK7D9DWhQn4ximvIsac/8pImFEUmYqAD0BHYqvrMAsG3ngBExQvMTdlg/O6MHtSulFo1/Mda4occzgNrx2mA/PCmMxw87vGk0N/GU7rU9pEjWsrf/cLTvadiyf0ZSKSrRXxN1KRul+le1C7cQNUM3kMYSxlAQ9ZKBgzziI35YP/1p5Yra+AbSSstV401Ad5mFRk5qXgKkjDdiIvVVUgbHJKi3xmCVw8nDRTfo0HXEtGGSAqICn45RChs2kaKmNtgghtl98ApP5gHAN31eYjZHl0jPlSgCC0ck5qCKUfSXDA08c2BFXH4bKxtAV0eOPpcHSzzA/Hm96iaQYxmdbamgLXVsodUc8OhbNhwtYOrmkHyzh1dX/6dDrF/O6dNFkiSv9rqMFLdyvek+Mrqh2r5QTHRm5f1frL6m8LD4JwnrC4QSl/qAm8L+7J6cQYKI9WVqMnYCVhhq/SFD0mwnK1X4zNDRrbJZeyNeW7HNJfONePZj8wWpOGa9eHkPNudv7tS3NMG5YB+BzawnGEWiJLdrcKf/M8UaN6SfCyb+8Iym9TmzDQF7JAJ1jtGBCJYqaL/RlDflw2XNBP0mOgj+wkXQqMjnKaG8Ru5jDRKa8+9obgdMd0I9dQ3mMNgKASO0+uGOav0FPo1z9J1PwKdXtDIhyE7u7WJv8WC02xHoPOv55djQiuSKWWtHwUXeDuqh63AWrhiGnyqhHXvgnnQ/6QrSYc9rAJ90XQgCcl5VRoYmvA/ZMOa53AUeOb6oHO/JqXZNXcaXO3eDqYl1OZiqY7 UDrZVprR AJVsk+ggstiC4s/qgy1bWWVXt97pfg9mSufaiByc/H6sWNFwNl/mbfE2j4SD+y7ljb9Mn6AFg2d0crS7f/3f7tLR9gtSfE8sVoqbeTcbucWPuuozAP9WryWC1BUvCNeFIqnzR4Qk5OsIfAFDqHk0f/EWrVWvOOYPxNnVQU2IffXD1yXWR/qebqqmn/fYDyxCEGX9k9SvG9wjsyLFPEUTjYN5STqrHlgJzYJ2UfKtJE3Z/Pfo5d3xicQ3fHgFviAV+sjjjLQVN0NIZQ+UjKrQinZykphaUfR3wl2ZA0D0eQWfvQy8SOZiHAu/Q92S7Ks9zblxaaGeaWASWickj08nlPoz3h8hbMoGA/Cqc 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/5/14 22:49, Lance Yang wrote: > Hi Baolin, > > On Mon, May 13, 2024 at 1:08 PM 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 b5339210268d..e162498fef82 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_ANON_SWPOUT, >> MTHP_STAT_ANON_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 d3080a8843f2..fcda6ae604f6 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(anon_swpout, MTHP_STAT_ANON_SWPOUT); >> DEFINE_MTHP_STAT_ATTR(anon_swpout_fallback, MTHP_STAT_ANON_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, >> &anon_swpout_attr.attr, >> &anon_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 8b020ff09c72..fd2cb2e73a21 100644 >> --- a/mm/shmem.c >> +++ b/mm/shmem.c >> @@ -1786,6 +1786,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 > > Seems like we don't need these conditional compilation directives here. > > The THP_FILE_FALLBACK above will result in a compilation error if > CONFIG_TRANSPARENT_HUGEPAGE is not defined. So we don't > worry about that :) > > See THP_FILE_FALLBACK in include/linux/vm_event_item.h. > >> order = next_order(&suitable_orders, order); >> } >> } else { >> @@ -1805,9 +1808,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); >> +#endif > > As above. > >> } >> goto unlock; >> } >> @@ -2178,6 +2187,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 > > As above. > > Perhaps we need to define MTHP_STAT_FILE_ALLOC and friends > using a same way as THP_FILE_ALLOC, set as '{ BUILD_BUG(); 0; }' > If CONFIG_TRANSPARENT_HUGEPAGE is not defined. > > Likely: > > #ifndef CONFIG_TRANSPARENT_HUGEPAGE > #define MTHP_STAT_FILE_ALLOC ({ BUILD_BUG(); 0; }) > ... > #endif This is not enough, and we should also define a dummy function for count_mthp_stat() when CONFIG_TRANSPARENT_HUGEPAGE is not enabled. I was also hesitant about doing this before, but adding macro controls seems relatively simple:) Thanks for reviewing.