From patchwork Fri Apr 11 22:11:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Price X-Patchwork-Id: 14048809 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 9DA41C369AE for ; Fri, 11 Apr 2025 22:11:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 259ED68002C; Fri, 11 Apr 2025 18:11:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1E1CA680024; Fri, 11 Apr 2025 18:11:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id ED88568002C; Fri, 11 Apr 2025 18:11:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id C0A4D680024 for ; Fri, 11 Apr 2025 18:11:35 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id E3DC9120904 for ; Fri, 11 Apr 2025 22:11:35 +0000 (UTC) X-FDA: 83323160550.15.6EDC0EC Received: from mail-qk1-f173.google.com (mail-qk1-f173.google.com [209.85.222.173]) by imf16.hostedemail.com (Postfix) with ESMTP id 40FC318000B for ; Fri, 11 Apr 2025 22:11:34 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=gourry.net header.s=google header.b=QF2b0z65; dmarc=none; spf=pass (imf16.hostedemail.com: domain of gourry@gourry.net designates 209.85.222.173 as permitted sender) smtp.mailfrom=gourry@gourry.net ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1744409494; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=zIYGb9o3ZNMSFtQQpPHltGF8QRH6KOuBpYhDX4oYg1I=; b=te4bv6UvzBlX4c/Db8bep9cIHOfudPvCB18lnVJ+H3NxGelrcTFFo4zHwYEylH+jzSgAyt u3HnvY2/6cmWllWQSEjEI3RikmXruyPpX36wRN1imyh4JfhNbp+4F9xw362x8plQQvSDya 8sJbaRbx9k15gnDGU9ihDXkX4Pzylo8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744409494; a=rsa-sha256; cv=none; b=hOoLK00TbwOb7Wi/DJ6eoDFAXOl3bUP6rU/AL8AHT4Wi8aEiVRLSxKXERdharZVMnXtdxb rpQeBb+iMpHJnXtv+GL+gaqtF44L6Y1LQIhdKKKb0ZDLVcu0+HqmZNFuMREzhIw4TwU/bA dkPohYiyJEFsX+cYafpnEcsICIggJR8= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=gourry.net header.s=google header.b=QF2b0z65; dmarc=none; spf=pass (imf16.hostedemail.com: domain of gourry@gourry.net designates 209.85.222.173 as permitted sender) smtp.mailfrom=gourry@gourry.net Received: by mail-qk1-f173.google.com with SMTP id af79cd13be357-7c5e2fe5f17so242256485a.3 for ; Fri, 11 Apr 2025 15:11:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1744409493; x=1745014293; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zIYGb9o3ZNMSFtQQpPHltGF8QRH6KOuBpYhDX4oYg1I=; b=QF2b0z65NKtwQorMMhs/PTRi7cBlxcH9bsBxSHfIsXDVLW484bh0whRNepGIe0+1wT bpdhuLKtLm/fylNpa9HllJa4WKDUj3ZnWiyMqSjLKHRNO0EwyuD1Ttwz4GQwXQ/xAwLQ o+216HS/CWZfvMVnzuHgIKwsKKJwVt1fcMXKgJcJ/RBm6U9wHoHxkbwOiLxyQ/jrRymn lJbrOxrZOPcIUeG3DCcPdcLS9HGzD8qDZA4MMcx8nWvO/N0rg8BT13SqDzWbh0dphC8V 2HNS7ge4MwuuC/Habu1TSoC5VccVxp8IRUKGQ29VazH3gAF7NoqcL3IVLk8qQEDDnxx/ OI8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744409493; x=1745014293; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zIYGb9o3ZNMSFtQQpPHltGF8QRH6KOuBpYhDX4oYg1I=; b=nIFLA5qG9KUZ9IeeI2lfa/hG1/42PLdvwz5nwGlstkXrDbkS9XJ0SEmygdV6Kwkdah 882N/FVAyn9LJSFLnUhFQ4mJBhiggHmnl2cET/1JXgwgsmtQiKvhFYejGWuM/vmu2WUU ixdRd255uxG/2BIuc/ebamVn1BTtUZIKmSVzNcQnQqEYZTqRL+Pamtkufdu42pbG+2UE 07ErVqx6S3E/NUVKbhnB8TxLBQhPDI9yG18j0YmF2+lvQ7tcbQMgcs2ULhhqPusfwinI NRNeXJDg9TcNb+fMVQU1u3O1XzGOUSewuYhV6Jut9vuRVV/LWsHAndb2obMsRrQgbdO7 rb2A== X-Gm-Message-State: AOJu0Yw1DPKgBXzq7EBCn2LhwziBoBX948H1XlPcg+4o0yoTfhPD1Ub+ u8TDNYtBoyw4t5GPNBy5m6M+9utMPiqS6m+JpKQPHhLLkGbR8NAep+HHVhavw3Uf1YO7FWOPlTe Y X-Gm-Gg: ASbGncsb8GvZEEj6YGCJ9w5e1DPH/D/Q7lpy/BzMlH5/fsOvea7W36/hVNVEhIK8z8M FYdbAI4OWU6ZDw+z19Fj8JYWaW8z8fWTfZYSizTooQx2Z9Ajjl35RgIbMDwI4V6e4GO0qghqdzB Lh7RsgHyjHChDAXO/sN2OsK6J4vgQejzeg0C2NBHgMmjn1IcMDC7Le6k7mHMoM2WV17akf1/KiS GOZriylVYTVsfcDUXWr4nNoxQXlo/KcXSg8OOTltRyhv5dtixDYuvPansEYRwAg240zGrRtdqFP 9mMY0zFoBq6pK8VwhiH08XiHWe0K46n3FH8jX7//F78q9LOUNc9IdHqPgDjmjx/Z1HaV2wafXqY I3d7mg6sunQtIMdHPNi1913ut2qJh X-Google-Smtp-Source: AGHT+IFv83+YHnaxvDRk0rvRzSWriqasX5eo6zDdijLVMUUFZ6zWAcypdJ15PvWFrs2NGam5+oBtYQ== X-Received: by 2002:a05:620a:2906:b0:7c5:5692:ee95 with SMTP id af79cd13be357-7c7af12ae32mr620115585a.51.1744409492937; Fri, 11 Apr 2025 15:11:32 -0700 (PDT) Received: from gourry-fedora-PF4VCD3F.lan (pool-173-79-56-208.washdc.fios.verizon.net. [173.79.56.208]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7c7a8943afcsm321264485a.16.2025.04.11.15.11.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 15:11:32 -0700 (PDT) From: Gregory Price To: linux-mm@kvack.org Cc: cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com, akpm@linux-foundation.org, mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeel.butt@linux.dev, donettom@linux.ibm.com Subject: [RFC PATCH v4 3/6] vmstat: add page-cache numa hints Date: Fri, 11 Apr 2025 18:11:08 -0400 Message-ID: <20250411221111.493193-4-gourry@gourry.net> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250411221111.493193-1-gourry@gourry.net> References: <20250411221111.493193-1-gourry@gourry.net> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 40FC318000B X-Stat-Signature: 8pc9fy5ous95bzoe1bioi5d4y3bp4gni X-Rspam-User: X-HE-Tag: 1744409494-247784 X-HE-Meta: U2FsdGVkX1+1UMXYw29BiqPAW7GoXZpRi7ga1AAl/5dg+Se2O7By0c3mm7eDvnYzn2NNKGsHsZnxp2DkvItv//Mibc4xLXohAJDYyBP++O3OYtw6aAmtF9o2TupoWd3U9/VFQU+726t5Hre2aRqbB0W2Onl6y/U8VrXACcprTuSNne+KmUl5uC85Tj3D7od3vCVFppG6vxST0EnovvwPC5Og6ZH4CYuvQmJU7/UZUSyjKPIhedloFO+pEY0LVmT4TeKnjIqtr9rmf6V/yPlNJCHie2nn05lQayVzOBkkV65F5bWrfYGtWZLdLzQm3BSnOcSxGT4/nN6t8Iu+Y9hOURtzvAHhOtjvCgvsvypAcJXbq0jLt4UWgbBurWu2Kw8njqWwkjB1qkNdYWp52RBmXxXvN90aTvHBjBpFmgbUYrnk6RRMJ8/CkwiugeBywv3gB50jj3ltgNXhDr+wUboDIR9oD6NZn1/ebfbWphv+l5m3Et7GrpFXdVg72wr2hNJNX0CmWvaymS2fRTTF024T8FcJ3LH3fAjkP++ulZ/F42TBGsI94AnVeXEvm7yNLarYwIiX5TZSGvu+S2bMQai4jJg9ovK5HeHfQfvm0fUYQGrd4IWy0iD8sSEQHXIx1+xGsy8oBKQrpl2Kbf2TUfO+kdZCf/WlfBaDgPs4JC6WOSbx50+FMaVqMOCRYxFltVNnl6PxWF0IEMU1zXwcwYICtcgJCeU3X9Hf9Nd5u+brlAg70QJ0FFnL4QE/7TMeulepdIeVBLE72MZZcKF/qDV8oORKdRCdNehztFmH9KLoITCT2GAg38Mk9uwmp8vDVHDp6wx4Icwu8LS6LIPlY8kMxvLKPpK1HP2Y12dVWVkCUuCfMClXLDH46STYX6/P77Ugs8ydPowB5+Jx/kfDyQPfF5mFn7Xou3DrFWkYXC1jV4Yrz+3Ad0aeeITwOZTKjfRtvfk9ulTLKoKB3f95N1Y MQuY2mIR fiVN/ 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: Count non-page-fault events as page-cache numa hints instead of fault hints in vmstat. Add a define to select the hint type to keep the code clean. Signed-off-by: Gregory Price --- include/linux/vm_event_item.h | 8 ++++++++ mm/memcontrol.c | 1 + mm/memory.c | 6 +++--- mm/vmstat.c | 2 ++ 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/include/linux/vm_event_item.h b/include/linux/vm_event_item.h index f11b6fa9c5b3..fa66d784c9ec 100644 --- a/include/linux/vm_event_item.h +++ b/include/linux/vm_event_item.h @@ -65,6 +65,8 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, NUMA_HUGE_PTE_UPDATES, NUMA_HINT_FAULTS, NUMA_HINT_FAULTS_LOCAL, + NUMA_HINT_PAGE_CACHE, + NUMA_HINT_PAGE_CACHE_LOCAL, NUMA_PAGE_MIGRATE, #endif #ifdef CONFIG_MIGRATION @@ -187,6 +189,12 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, NR_VM_EVENT_ITEMS }; +#ifdef CONFIG_NUMA_BALANCING +#define NUMA_HINT_TYPE(vmf) (vmf ? NUMA_HINT_FAULTS : NUMA_HINT_PAGE_CACHE) +#define NUMA_HINT_TYPE_LOCAL(vmf) (vmf ? NUMA_HINT_FAULTS_LOCAL : \ + NUMA_HINT_PAGE_CACHE_LOCAL) +#endif + #ifndef CONFIG_TRANSPARENT_HUGEPAGE #define THP_FILE_ALLOC ({ BUILD_BUG(); 0; }) #define THP_FILE_FALLBACK ({ BUILD_BUG(); 0; }) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 40c07b8699ae..d50f7522863c 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -463,6 +463,7 @@ static const unsigned int memcg_vm_event_stat[] = { NUMA_PAGE_MIGRATE, NUMA_PTE_UPDATES, NUMA_HINT_FAULTS, + NUMA_HINT_PAGE_CACHE, #endif }; diff --git a/mm/memory.c b/mm/memory.c index e72b0d8df647..8d3257ee9ab1 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5700,12 +5700,12 @@ int numa_migrate_check(struct folio *folio, struct vm_fault *vmf, else *last_cpupid = folio_last_cpupid(folio); - count_vm_numa_event(NUMA_HINT_FAULTS); + count_vm_numa_event(NUMA_HINT_TYPE(vmf)); #ifdef CONFIG_NUMA_BALANCING - count_memcg_folio_events(folio, NUMA_HINT_FAULTS, 1); + count_memcg_folio_events(folio, NUMA_HINT_TYPE(vmf), 1); #endif if (folio_nid(folio) == numa_node_id()) { - count_vm_numa_event(NUMA_HINT_FAULTS_LOCAL); + count_vm_numa_event(NUMA_HINT_TYPE_LOCAL(vmf)); *flags |= TNF_FAULT_LOCAL; } diff --git a/mm/vmstat.c b/mm/vmstat.c index ab5c840941f3..0f1cc0f2c68f 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1343,6 +1343,8 @@ const char * const vmstat_text[] = { "numa_huge_pte_updates", "numa_hint_faults", "numa_hint_faults_local", + "numa_hint_page_cache", + "numa_hint_page_cache_local", "numa_pages_migrated", #endif #ifdef CONFIG_MIGRATION