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 7853CC2BD09 for ; Fri, 12 Jul 2024 11:57:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7DC7C6B007B; Fri, 12 Jul 2024 07:57:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 78C1C6B0082; Fri, 12 Jul 2024 07:57:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6533C6B0083; Fri, 12 Jul 2024 07:57:56 -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 4852A6B007B for ; Fri, 12 Jul 2024 07:57:56 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B1CC61A0ACD for ; Fri, 12 Jul 2024 11:57:55 +0000 (UTC) X-FDA: 82330951710.22.E6A210D Received: from mail-ed1-f47.google.com (mail-ed1-f47.google.com [209.85.208.47]) by imf13.hostedemail.com (Postfix) with ESMTP id A6C202002C for ; Fri, 12 Jul 2024 11:57:53 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Eh9dX8wT; spf=pass (imf13.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.208.47 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720785440; 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=vb168vXXnQI2V8n1uRl3KKSKYvLL9f0nbmEpaLbcWdc=; b=YyIJUo+i2rZTz3KaFEP+pIhh+9GLqVF/rmxpM8QZxpyk+TSIwb2v8irf+UOQhadXy58R+A Cv0TfL/2woKcC2sR7j4K0nljdVOu8wTs+Qwq1xZw+5kqDRtv66xGapMDITkpirOvtvX3LE gRJ22r57Wc7EEcvCw8ikmbUfUsfPniw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720785440; a=rsa-sha256; cv=none; b=ivnDYFePqBCQ+VgMe2RvMNmjheMNI8Z1dt3mPeYtcRnhffet5tPlEAyDDe80NBa1pMtJPE K9fmdMn0PdI4EgNlKCoOxoHNehHcXHTzHI4PDdL8nOQWJ/g8NE9GHy8p82jE13RsZNeCHX mFCfGG9YKphclT0qE/Jvqdb74KazeXs= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Eh9dX8wT; spf=pass (imf13.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.208.47 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-ed1-f47.google.com with SMTP id 4fb4d7f45d1cf-58ba3e37feeso2341697a12.3 for ; Fri, 12 Jul 2024 04:57:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1720785472; x=1721390272; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=vb168vXXnQI2V8n1uRl3KKSKYvLL9f0nbmEpaLbcWdc=; b=Eh9dX8wTzrG2ESu5sJ0BrL4cbLD5l6Hnz5Czx4O5+xuAZIpeA9x4RVAHatOzlFWVCm zotgwz3Z5y8d4chTTlFWXGand+c07CkEdaCa9vfxAKyx3d8RCwecWIhKzinjIRxnlypC l4pnh0IrhGftrqGUtZelMhEN1da+XFYGLpFejEBtx91UDKyNxGTjcJh4YOaAThYW/XqP 0GENjfkRsPkP5ewWZ80WCXHU7NGw8i6thVtMh/kJYdcpp/DQYTgzQ1RkUiMjlbZrrWeb mSiGVfmHNO3lxZZRryjjP+lAlB2YPdxM62Ab2hGPGrFVRdWQGYQD7moGQbP1E+ys4rGB 8LBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720785472; x=1721390272; 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=vb168vXXnQI2V8n1uRl3KKSKYvLL9f0nbmEpaLbcWdc=; b=Xo3bWVX9quIpEMSs3hpB/c5ob7ISsUEcq6PDurP782dKkUlDLBYHVRcdjFvqz3tZsE 4PkIq8wxm0l6GruS5dvSDR4tH8Q3bXZ9GgOoUJpM8fu6Z41H/Vzp3uqlWokSots0p1D0 l1GFvxGDTBb8SOdb0BHmQdO3wMg8AgcnCchJDfGVIW6M5O4P5iDkAIampaMPAsZM4tqM WYaIfJO5BVZJYdFnEzoy4lMfBt3xA3kN2VUg9YSGhaZt1IvZbL8f3HiDZ7vq8QUiF+lG 1r4cvWYlw4mn77dJ9YOP+7zuXadjJS9zIKLPFg8Z0ZC5aFFwpSORp4LhFChY73HhDM/G +JfQ== X-Forwarded-Encrypted: i=1; AJvYcCU55KgnWtuulDMCwNbAYzeXiILzK1/kJ6zfz4t++R+Ods+MbXstw55gzj0tdoJgIFz8wR/BMGuvURnCaR8YOWgZAkQ= X-Gm-Message-State: AOJu0YyAzBbRkRgcwL22TdkHzy3AwdaTZa7bC6NoEyejxfQ5cnZDJA5f PsjAnrSeTJsc3mFUva0OSKGnyyrDJe+ey1UbIpy9ahT9Evb5gFGNTNYp4P5abSdK8ciazsiIg5g Th94lFAmjzmXWZuLkeGHVTBSvo0o= X-Google-Smtp-Source: AGHT+IFaomkXOuM9XjTzQrrVc5d4DV3ytdrZ0q1r67q8x7HFSvLZmmvJLfSdqpVjkt0y1naLZRhvyYp0eoRtdHKGt+M= X-Received: by 2002:aa7:c346:0:b0:57d:30b6:4281 with SMTP id 4fb4d7f45d1cf-594bc7c811amr6655873a12.29.1720785471662; Fri, 12 Jul 2024 04:57:51 -0700 (PDT) MIME-Version: 1.0 References: <20240711072929.3590000-1-ryan.roberts@arm.com> <20240711072929.3590000-2-ryan.roberts@arm.com> In-Reply-To: <20240711072929.3590000-2-ryan.roberts@arm.com> From: Lance Yang Date: Fri, 12 Jul 2024 19:57:40 +0800 Message-ID: Subject: Re: [PATCH v1 1/2] mm: Cleanup count_mthp_stat() definition To: Ryan Roberts Cc: Andrew Morton , Hugh Dickins , Jonathan Corbet , "Matthew Wilcox (Oracle)" , David Hildenbrand , Barry Song , Baolin Wang , linux-kernel@vger.kernel.org, linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: A6C202002C X-Stat-Signature: 1kux1xafunu9amyzs9o4bdxuumypjozd X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1720785473-166164 X-HE-Meta: U2FsdGVkX1/j7NhUW9OLt9y7nOIVgNh1BPkepZah2EkyI9KzPD49cVu3NbSsGvGw4fc3RjxNoGC8w+/XpLw6TueS/okOqb0nDysEjBas99rUMj7cE6I2Flje/v7EWphAm0yfr3p9tgPN/SEuD042ADqx9riMToigE6yfE43AQ8q3YIp/VYs7uEI3B8GUvlqWOVFwSNhdh+uhu19A0HM65wK+lvlGv17HkAsoBWl/9Ejrt0zm+bcZYDKmTd2MQPW46CavodQxl5Wn/vZEJ19PQqvppaTrJ6rKDQ5BD9UNJQcF8y2ccUQgaKLgXw0h09oCg0yza4cLVWru0DHTwh/9wNE1a4w8BApCzJpbT3Q+XW0wpW+yh7J5zTrvUuhudDOla6Il3ANCA500Ys2N8xZAZFXWT3iBZtd1n5+S8l6RyI4YqevgW5qOlle3nAnweBrL7SA7Ygy5FdLrlD9fROLm9nXWM6XnsxJYig9U8MQaF6hnqadnds/yIxNfv5vqRnmgD0Im3v4xMrcyPd/lxM7H1rGcc3JKGYuQNIEP84WpU3AGOTCslWMChmq6+NC24h9LQ55lm99QhdfTd8KKBKlmPr2GK4ZQHaoa1zLg7ZNPXP8HxvBVaeqNTCi9C0LVPAonRn6YAFPwSxLqvdmyuxlO+XjlmSLmjmMlFZ4mdkhBHPNdrplQEEWpyaZfIALa5QV8UNE8a0aXjdbBvaF5qt8xVb3PpMxxvVTRkof8h9q241MNb2Tm+vLXvp1aBkrz9oTA7XJ07ggk2P6oiEyiMRftZfvXbbf2xQtKFzTvlMQnk1qsT6V8bifbit3Ny2VQKMfJdwv/h2nZ3ypLmb8605OH2IBWjmhliCNylXBI5Ug+9oBybsuldmQLk4JdOd9fhJsS1B41+KovSIXg/Lj2Lx7kZTKUZaXdC0U51b5ZdPR/JpGeYEV76MVs/JEGY6tBHEYqoOntAMisACJURSrPb24 ItLQsCaN hl02AIKfVK1Au/oNEpQ1xfL6wdeGqi2y6AklEABtxhXEE/ZrY3os26NSugtvd1FRd07nVyZGz95fQGLPWCA3yxyeOJatHBUpWmGDDCzoNLz1uz5rwTOBOjm2iKwhJj/4QrncHbj7Inp+NRYFtqOlQL8uXC7Cbe3+J9/V7Pp0BYXmUaT4UveerUp3ne4vXE//iBg2Iywvx2I4cMJLcVVTlVfUM7Ml/DvQfknpAaDaMtT9xnFhtOf14WQFNlZGapeWEdV1fYEhqyWj3KzM12antgzv+NlC9um4GHvLDP8YIg6FcXk0iRLZW5FLhZPAIExVxKtLdWUyceNF/mSCe057Rlut9MaJTr2WmA6H+mfpTtTG7XWJsoospu2Eb9aXzmTTya4RJJ9w3hWfcAfFqE4FBcptsQrkrbyGmYo2xCdUX6Burjds= 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, Jul 11, 2024 at 3:29=E2=80=AFPM 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. Feel free to add: Reviewed-by: Lance Yang Thanks, Lance > --- > 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_a= ttr; > #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_COUN= T]; > +}; > + > +DECLARE_PER_CPU(struct mthp_stat, mthp_stats); > + > +static inline void count_mthp_stat(int order, enum mthp_stat_item item) > +{ > + if (order <=3D 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_COUN= T]; > -}; > - > -#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 <=3D 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(stru= ct vm_fault *vmf, > > if (pages =3D=3D HPAGE_PMD_NR) > count_vm_event(THP_FILE_FALLBACK); > -#ifdef CONFIG_TRANSPARENT_HUGEPAGE > count_mthp_stat(order, MTHP_STAT_SHMEM_FALLBACK); > -#endif > order =3D next_order(&suitable_orders, order); > } > } else { > @@ -1803,10 +1801,8 @@ static struct folio *shmem_alloc_and_add_folio(str= uct 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_SHM= EM_FALLBACK); > count_mthp_stat(folio_order(folio), MTHP_STAT_SHM= EM_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_SHM= EM_ALLOC); > -#endif > goto alloced; > } > if (PTR_ERR(folio) =3D=3D -EEXIST) > -- > 2.43.0 >