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 8E9C2C3DA45 for ; Fri, 12 Jul 2024 02:31:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 264356B0096; Thu, 11 Jul 2024 22:31:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 213916B0098; Thu, 11 Jul 2024 22:31:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0DBAC6B0099; Thu, 11 Jul 2024 22:31:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id E52A06B0096 for ; Thu, 11 Jul 2024 22:31:16 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 7132EA32DD for ; Fri, 12 Jul 2024 02:31:16 +0000 (UTC) X-FDA: 82329523752.18.0F021F6 Received: from out30-133.freemail.mail.aliyun.com (out30-133.freemail.mail.aliyun.com [115.124.30.133]) by imf29.hostedemail.com (Postfix) with ESMTP id 12A7812000C for ; Fri, 12 Jul 2024 02:31:12 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=YtHdSNFS; spf=pass (imf29.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.133 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720751441; 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=lok5tuEdeyByFVRG4EgUL7JH/PFSJe458NPgFNKRyXE=; b=ePnAoUI7JUgg9Vd+m8zpwoVnxlQghB8miAclMGwO0+HBwfw9rIy15bUt57P6RT/Xd0i00P 4tIl1O7dHGKYimky97z52LgYos6YhxSyOOxuM8G+yg1sA6edJt9Y0aHr0/Nx1hOznxlw7G RXTwwLFCgFO3bPnZSXnJDspiA1DLjTM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720751441; a=rsa-sha256; cv=none; b=BuXIqlKhwHtVCTpMNLuqAQcToo1l4RyGwoVc3P1CTYCZgsectJ6Cej6yGnVrCxS64XUEIY w4HFOpuRJP4hgG6r3s5c9nO0ojUTwQqZLiklv4+u+hxrPVzIo6RutBDwfUeO2vk6mh58xn aMOQCSISYvwDNmcfOCaWv1A+UGFerAA= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=YtHdSNFS; spf=pass (imf29.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.133 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1720751469; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=lok5tuEdeyByFVRG4EgUL7JH/PFSJe458NPgFNKRyXE=; b=YtHdSNFSL+IQFH40O64NPxSIPV7jY0BgRKA0kDTxmNt5pWJF56IM6g7rMuSYBsjq91+HsBn7JxbtNU/c8GjQWPPy7AX/jBocxztCK/dtT5xgLJMPDjMgOdb+bueKhPaaWT+yZfC/XGWrTVu7dNu4+lJogNjzFVqKUssxuA3Wy1g= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R151e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033045046011;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=10;SR=0;TI=SMTPD_---0WAMLwvw_1720751467; Received: from 30.97.56.66(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WAMLwvw_1720751467) by smtp.aliyun-inc.com; Fri, 12 Jul 2024 10:31:08 +0800 Message-ID: <0037de9e-bd64-4203-960d-bbc31fff611f@linux.alibaba.com> Date: Fri, 12 Jul 2024 10:31:07 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 1/2] mm: Cleanup count_mthp_stat() definition To: Ryan Roberts , Andrew Morton , Hugh Dickins , Jonathan Corbet , "Matthew Wilcox (Oracle)" , David Hildenbrand , Barry Song , Lance Yang Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20240711072929.3590000-1-ryan.roberts@arm.com> <20240711072929.3590000-2-ryan.roberts@arm.com> From: Baolin Wang In-Reply-To: <20240711072929.3590000-2-ryan.roberts@arm.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 12A7812000C X-Stat-Signature: dr79eynicyasfnhnyewgxtx4enomey5e X-HE-Tag: 1720751472-993186 X-HE-Meta: U2FsdGVkX19ZqHvqbDinyUO0z0sLzc2mcoXt2eV0BvF51qo3o3j/bVgHnVUDftkjsMghtBSZxmGeat2fZhwmz10wImZHIzuCf20TWx+5haQNfxJXYRoxBUNPJ+s/Fd3VwoAmPLavv+c6h2h8MYcekr+JWDp2nE9Gt7mzjAi9u9ippSd14kqUdB4F6K5yJjDoEWNNpCkKZpR/SloYZ2Vqq14CkduqkklAMhVhuF0aGLy594jaLccjv4OnQabp/VijEiao8MV4kOa/M/JHse7OwlL8aR3jb7oB+qGPevW0TxmZ+GTGcqgCQNrCkKZqsBrQVwyLhgR3v5XGQqSck1hMD9kJ6ZnNa5Vf7a5lbNNWGs0tEtKB5z2xyNQDiZAM9qWD5t0tyZM/KnwDJkljVtOEeRG3FUnoDwQ3aHq5s2MX2vgwnj7O04P3YFBeIYbk5/RZv6q9giFP/FaEYxZXqOfyxIOhqvNWLEbMb+rRo7XlpP4a3eSSJ1elMQEnCCBv9nPCpdz5ohAE/hLIOb+wLtYCgSLINMHcyaE/3s1kqRe27tbD1yPVmsBML78K3e6i7xo05Hg8Xe4r+qNTSpvvWE+HRhn/1beNjLw83YJ7H73S/GtikLo0jd0lF3bWRSbWcQhr4oHGi4KdFk2WaElfprVWXuzNBi0sV1mezxatS/YqeM9g1t5auyWDgKHWCqK5U5/44EkwULymUPPE48C5qFpILQsJhFGGd+G9HsQoS5fBydSgviLPWnqILWwsu5MfHR3Zo7z5+lPnrnPGyPr3kTnB65ffKijijykdS8Y2UB90likHdJfYTV18t87d0hcsMXmJiljRO+GuKz8VpaPFOpIOINnJ2bsxo0R0wDGPSpdZ1uh8/AFlnH4ZySy/XNMH+Aoynzw+OeGeGsDqnciW/xvJi7754ZGpmBoHCt0uKVwpKCUvxaCCtAqNA0Gyj4xA3l2A/P9dbssV3L6fsWenKgv 3R4ZOBWA YJ8Gs0ZrezTtZLjK1BjgPl8mYB5NpN+zcHnfmxEuv+1mdsZQAM6ZntKFg3XiAbmE4oj0fYMaoa2gn/WUrFu4Q09UH5EUucXmxRKyJLFUjuHCE4SpJbx55cgYPyHldv4TvtGyY3Fg/8g/Q2m2quyINsy26h9pGxg9+hfh1RDWlBXPt2UPIWMj/Y8c6oPfegoUcBOZ1YMpocnZjZ8MIdFH1IP3EjpPJlRA00aTBEO37lvsG5o3Tz3s60EM5CXy3XkJWQCVuOjgEtZYNIyAMZoS5FVGvslgGVisZIx6Ib2xU6FeEIslrT0m/L+Gr99dg4v4pQCxZshB5A65gbAB1QyHq1cUts1U6SxTUrGtZ 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/7/11 15:29, Ryan Roberts wrote: > Let's move count_mthp_stat() so that it's always defined, even when THP > is disabled. Previously uses of the function in files such as shmem.c, > which are compiled even when THP is disabled, required ugly THP > ifdeferry. With this cleanup, we can remove those ifdefs and the > function resolves to a nop when THP is disabled. > > I shortly plan to call count_mthp_stat() from more THP-invariant source > files. > > Signed-off-by: Ryan Roberts LGTM. Reviewed-by: Baolin Wang > --- > include/linux/huge_mm.h | 70 ++++++++++++++++++++--------------------- > mm/memory.c | 2 -- > mm/shmem.c | 6 ---- > 3 files changed, 35 insertions(+), 43 deletions(-) > > diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h > index cff002be83eb..cb93b9009ce4 100644 > --- a/include/linux/huge_mm.h > +++ b/include/linux/huge_mm.h > @@ -108,6 +108,41 @@ extern struct kobj_attribute thpsize_shmem_enabled_attr; > #define HPAGE_PUD_MASK (~(HPAGE_PUD_SIZE - 1)) > #define HPAGE_PUD_SIZE ((1UL) << HPAGE_PUD_SHIFT) > > +enum mthp_stat_item { > + MTHP_STAT_ANON_FAULT_ALLOC, > + MTHP_STAT_ANON_FAULT_FALLBACK, > + MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE, > + MTHP_STAT_SWPOUT, > + MTHP_STAT_SWPOUT_FALLBACK, > + MTHP_STAT_SHMEM_ALLOC, > + MTHP_STAT_SHMEM_FALLBACK, > + MTHP_STAT_SHMEM_FALLBACK_CHARGE, > + MTHP_STAT_SPLIT, > + MTHP_STAT_SPLIT_FAILED, > + MTHP_STAT_SPLIT_DEFERRED, > + __MTHP_STAT_COUNT > +}; > + > +#if defined(CONFIG_TRANSPARENT_HUGEPAGE) && defined(CONFIG_SYSFS) > +struct mthp_stat { > + unsigned long stats[ilog2(MAX_PTRS_PER_PTE) + 1][__MTHP_STAT_COUNT]; > +}; > + > +DECLARE_PER_CPU(struct mthp_stat, mthp_stats); > + > +static inline void count_mthp_stat(int order, enum mthp_stat_item item) > +{ > + if (order <= 0 || order > PMD_ORDER) > + return; > + > + this_cpu_inc(mthp_stats.stats[order][item]); > +} > +#else > +static inline void count_mthp_stat(int order, enum mthp_stat_item item) > +{ > +} > +#endif > + > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > > extern unsigned long transparent_hugepage_flags; > @@ -263,41 +298,6 @@ struct thpsize { > > #define to_thpsize(kobj) container_of(kobj, struct thpsize, kobj) > > -enum mthp_stat_item { > - MTHP_STAT_ANON_FAULT_ALLOC, > - MTHP_STAT_ANON_FAULT_FALLBACK, > - MTHP_STAT_ANON_FAULT_FALLBACK_CHARGE, > - MTHP_STAT_SWPOUT, > - MTHP_STAT_SWPOUT_FALLBACK, > - MTHP_STAT_SHMEM_ALLOC, > - MTHP_STAT_SHMEM_FALLBACK, > - MTHP_STAT_SHMEM_FALLBACK_CHARGE, > - MTHP_STAT_SPLIT, > - MTHP_STAT_SPLIT_FAILED, > - MTHP_STAT_SPLIT_DEFERRED, > - __MTHP_STAT_COUNT > -}; > - > -struct mthp_stat { > - unsigned long stats[ilog2(MAX_PTRS_PER_PTE) + 1][__MTHP_STAT_COUNT]; > -}; > - > -#ifdef CONFIG_SYSFS > -DECLARE_PER_CPU(struct mthp_stat, mthp_stats); > - > -static inline void count_mthp_stat(int order, enum mthp_stat_item item) > -{ > - if (order <= 0 || order > PMD_ORDER) > - return; > - > - this_cpu_inc(mthp_stats.stats[order][item]); > -} > -#else > -static inline void count_mthp_stat(int order, enum mthp_stat_item item) > -{ > -} > -#endif > - > #define transparent_hugepage_use_zero_page() \ > (transparent_hugepage_flags & \ > (1< diff --git a/mm/memory.c b/mm/memory.c > index 802d0d8a40f9..a50fdefb8f0b 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -4597,9 +4597,7 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf) > > folio_ref_add(folio, nr_pages - 1); > add_mm_counter(vma->vm_mm, MM_ANONPAGES, nr_pages); > -#ifdef CONFIG_TRANSPARENT_HUGEPAGE > count_mthp_stat(folio_order(folio), MTHP_STAT_ANON_FAULT_ALLOC); > -#endif > folio_add_new_anon_rmap(folio, vma, addr, RMAP_EXCLUSIVE); > folio_add_lru_vma(folio, vma); > setpte: > diff --git a/mm/shmem.c b/mm/shmem.c > index f24dfbd387ba..fce1343f44e6 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -1776,9 +1776,7 @@ 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_SHMEM_FALLBACK); > -#endif > order = next_order(&suitable_orders, order); > } > } else { > @@ -1803,10 +1801,8 @@ static struct folio *shmem_alloc_and_add_folio(struct vm_fault *vmf, > 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_SHMEM_FALLBACK); > count_mthp_stat(folio_order(folio), MTHP_STAT_SHMEM_FALLBACK_CHARGE); > -#endif > } > goto unlock; > } > @@ -2180,9 +2176,7 @@ 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_SHMEM_ALLOC); > -#endif > goto alloced; > } > if (PTR_ERR(folio) == -EEXIST)