From nobody Thu Dec 18 05:19:44 2025 Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4964F29DB60 for ; Fri, 11 Apr 2025 22:11:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744409495; cv=none; b=m3GnmD8x+tChTDOO8Zf7UqTTA+cRMd+UunAzFdUF/HEV22hWGBRHqApY69hx37j4ILxfGJFIEarpf7tSVlG6KMVM+QH7lDVOBC3Z20rLAIAwr1QTFVBn8ZMC7zqSmpaO3gBglutSJlauZCDh4whmFdrEmUDGAz+8EnFoOLkYR/k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744409495; c=relaxed/simple; bh=kJWlhdTJTSNuYWImWmYIv1Uf59B3tlS7eTrMHq4Ex/0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VmSzlh+X3DHvIlSor5QekipbpK6CvTqZS5COnoQyZrJLlt9bOG0ANoRWEt376dI4wdKG9bpdWBqE1oMujpku0q9TYoos2B88gqQkKTU8ZwIDfCSUHJNbyrgHTSCVUHk11Q+9ovp/itXi7RvngaMbi/jmL2EaFSZ/nvbG5PXCsQs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net; spf=pass smtp.mailfrom=gourry.net; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b=TdGW12g3; arc=none smtp.client-ip=209.85.222.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gourry.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b="TdGW12g3" Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-7c5e2fe5f17so242256285a.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=vger.kernel.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=TdGW12g30q3/AQsNCcS212qsR0uh5AW+C+WCWm3+v8St5raVfGJt98eir+FyBikS07 2Rmu+Tw94+2SVk4r2ip0QSNxt4iucGxAN05XuVNqVl8okhCkztRCoGPMV6Z9I+sBQ9PN oFip9oo07UCfEP4ifuIv0N1Cacg+WJJweTHASNSaWCnvsTFWfadzd5T+mWYIlp0Ksset eZiw0iP91jAF3I8JMEdbyFNBF0fBanLUNIcJcq4HJtTV9fW0N/PQ3raNve6TB3057/5S wiswEzVz734cpP0VDQ2vFwjK0PS9dstkYXvtgS47/Z22eRLrwOXU0UQn60/qUJq8CLhr 1kjA== 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=vj87cSJIca/ZnKGy2jaqPi0rzGN7KBDPWQthg0mX2IMJkS9LiRpdykWTjd6C+kTUU/ HM5iw86G+p1CbE7Kp97FXKhYmRAi3WArmVSB4K23uPe2aCZzjj10hiOyy2vN0Nv5Y/WS i4/0ANGrNiGujCazi8bxGoQGmA5Qx2LBCSmKynZ8wwQSDACFyZzBf1de+VKDMcL4rcLx XwaP0CfUWUrTPMnSZajelooqLtCDRikrngYijugstyRu3gYKISC6PzOf2J7zL445LiGB RCywKm36eJoJ7nhcCZdfb3JBsLgxdGXLpTdcTjM3nw0pzTYK1oTd3H9QvnhTWfQ1mwTD ucUA== X-Forwarded-Encrypted: i=1; AJvYcCXaPoN9xizv1GplC2JTnM/RKYhl14535gBoq+AWMUP8yodjftHUFc5ZDBw1sFpdBxNjaiWKFxmNDA35q6E=@vger.kernel.org X-Gm-Message-State: AOJu0YxZp1bh+FyKoIE1pbFakmhvbccAoslPQoq6AA5Y0YMxas4NP2hn Oy3HtFV6EE2r7GzwwmUDQPn4bupjA9iZKMVtDG+RHbH6SDYiJhwV5KHL9nBfTmE= X-Gm-Gg: ASbGncswILbZX6I0FDYdy3Ws5UlFgqLZ4+rpp0NvIKG/xxSnPxp+PHEaQlJiA73oK5d bMbpbssZymSNZnU1+grwjbe8Zqt+d5Mlob+MaUY7km5TLI3tDqciHUX9Ibf3dvuija3WUDyFkxa FeQLGqet/NpqTxI2789KfP9qpAVgMYWeqHIzmUwgl7cWWfKFBGBPVtei1Uz3NB4HFxfGnKch6Ex etPqfISAxItN8Me5ZCldqnbZfGYODXrv6mCh1Wc61PMGWaZCVRK1A79q9Hfs9OXGIyp0n3/dVEf YKENG0Lhue68TjF6+CsnmReLC2HkdZOu8EK9hE839XRMgxgB0fsdFYNczwPvnW7gwI0bYO3dAJg cd5fxLNW69KniTUNQeJ8R2Z9igM86 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 }; =20 +#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[] =3D { NUMA_PAGE_MIGRATE, NUMA_PTE_UPDATES, NUMA_HINT_FAULTS, + NUMA_HINT_PAGE_CACHE, #endif }; =20 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 =3D folio_last_cpupid(folio); =20 - 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) =3D=3D numa_node_id()) { - count_vm_numa_event(NUMA_HINT_FAULTS_LOCAL); + count_vm_numa_event(NUMA_HINT_TYPE_LOCAL(vmf)); *flags |=3D TNF_FAULT_LOCAL; } =20 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[] =3D { "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 --=20 2.49.0