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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 92726CCF2DB for ; Mon, 19 Oct 2026 06:43:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 727706B00BA; Mon, 19 Oct 2026 02:42:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6FFF26B00BC; Mon, 19 Oct 2026 02:42:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5EEBD6B00BF; Mon, 19 Oct 2026 02:42:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 2E2E96B00BA for ; Mon, 19 Oct 2026 02:42:59 -0400 (EDT) Received: from smtpin13.hostedemail.com (lb01a-stub [10.200.18.249]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 9197D12063D for ; Mon, 19 Oct 2026 06:42:58 +0000 (UTC) X-FDA: 85338433236.13.536F104 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by imf17.hostedemail.com (Postfix) with ESMTP id C642F40002 for ; Mon, 19 Oct 2026 06:42:56 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20251104 header.b=iHa0NGfk; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com ARC-Seal: i=1; a=rsa-sha256; d=hostedemail.com; s=arc-20220608; cv=none; t=1792392176; b=OMS/2ik46MjMue2Vf1xRhOiTrODZopkwkpQUIeWY3Ohv3D7957U0s9CTjk4EAllTBYheuP FQKc1C7A/aZMXO4jJyV1NZVVOuNuF7X6VGgpOruzSxp7xziPSbf+KFv0bX5HQUl6VpWGYg 9Tu6KjbEKeMMD7mCw6z5K7s4+ODr1WA= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=gmail.com header.s=20251104 header.b=iHa0NGfk; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf17.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.210.170 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1792392176; 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=4zn+seGJGD/ryx0jBfvBnoaTE/c0alNVdxFqtcQz078=; b=cto6tnA+z6srL+QljzB0bOLxZRvu63MVKzlLszwZFPY3flnuUtZCHd9zWf46mhjDqCQxpI +WqH8ZeQrS++HoJ376UzSQL18mBAzHPKDIVV5uI+By2LPZe0UYOHAaT3EcK24lqUWaiTh8 hJsD0WndvqktYl6GEswBJRocje+aJ2A= Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-8897e83332fso1394610b3a.1 for ; Sun, 18 Oct 2026 23:42:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792392175; x=1792996975; 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:content-type; bh=4zn+seGJGD/ryx0jBfvBnoaTE/c0alNVdxFqtcQz078=; b=iHa0NGfkRcZK5ke9/O+xVkyR34N/QN6MsMlC4pcZis0UQ+G0AqNTDIH0v8a5tRr8H6 cuLkcTcuuDJQpZuYB4iJXsm0AzNzJPUqV8N63+nHmhYi7JpAkIFhYS3U9exUQFHHttz0 ccXAFM5+671++ZW1LDZ5LMqF8mFgFdmLEhxuF0a58vhZoAI1dLdt0OH1V2Kc1FluU84s dWHpIq5PdV1xohj/g2PmCqy6MRXHC+axoK43yOsjwJCactkVYwSJ5V2EuNoTTXM+y9Xe sz0RjDqmz9UaQsKyr1w2ioYEK/i0I4gvBlROz7BOQVkc3i7Y0WRJlCyK8jrVQ+Cd0XdI BscQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792392175; x=1792996975; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=4zn+seGJGD/ryx0jBfvBnoaTE/c0alNVdxFqtcQz078=; b=JiEAoKQiZurwAcSSVx0e/4fZh3oiiPuGqna3FgVseeb0lLAYRkNmORFfked4DXjvDu Md1flqTayCsK9VKv0yW0AuE4FkV7ml0yoAfsdysmIgTgGi8ixShtmAA88sPXpQg1uujR KQ6bI1PKRYlD/+/QaJfh7PFbwMC+DzKQKNLZhlcVk5kz8jGNJ4DuNG92rXpEEiGDKoic QLaPY7GltGVUMgdPTYDEmNyfKhsdzHYSSwjk3kez1ShRjXsAQAqM6PafTBDkzJTFknLR GkRwJHhwQwoBEjPcq3iwUQRr3tIX4aTpmvZx06F90akzf6r1K00puFhkBpkdIM2OaidM DGLA== X-Forwarded-Encrypted: i=1; AKwUvBz4HcyV7Hcq3iPfxsShql1880Fzqi4ZQ3+LsEevPyi6yvVljdV+odU/oeZBn3f1D70M2JDBfe+yYQ==@kvack.org X-Gm-Message-State: AFq9FYIZcMZLwPBDg6Oz9xyv6YrmNq5PW0/feBrOBW2y3diZRAw9gtZc By8G44HgT8tt7MIO+ZwIkRoLvP3uhzrMKG0j7mj8PuYYDNXm0oqk6vfE X-Gm-Gg: AYBFou0fKqLOK2XcU05IAso4706sgl+h2mJlIr/Kk3EpwtCs8n3j9H2JXlty+mIDCtw UJgbsZ4SvQiUlU65cy48AkhEXHEwSvwbDMQQe6jAJHwuLJ/SD7VLIwpFwkcqMAC31hPcW9tmYsm s36jvwnIjdFLLkqK2HsP3ULwD5G38NivmEYAufvL1GQm/ZYpg7Mj5UWuPHSZ0QnmITtLA50XYvd SeRp8E+lzQKCFaZJtMDlLhO1y+8Dtq3G9+PSlU8Wuf185XGJk7j5z3j0fFk4d2GS22ockIQUIm/ Bkejsf7NjyADL4X3pWfgZTK3M0crOgVEhHO7+mjJOO3rx2/7E0xqwUeHD5N1OjEMyL+y46J3Xrt GEuqDK1+3UjxmPzaCrqLLovp9IuPlwX0TDpgLA7Uw7qbcZKdEOaHVSn19oJs5/llPYAKmFL0sPX kGzUA7JpAK16JBF3cu+ZSbMYcv4/TKDAjpmS+pVtrVgR3wSiPKNqJPwNweP/eXUu6/OtS5kdAaF sWR4o8kAmh+gT5bQmpgJR2VSXvYmnrOH/xFno94A8eMELdodSDyh4XNKZMroS2aWqTD4Q== X-Received: by 2002:a05:6a21:62cc:b0:3e2:28f0:b360 with SMTP id adf61e73a8af0-3e228f0b803mr4007553637.0.1792392175487; Sun, 18 Oct 2026 23:42:55 -0700 (PDT) Received: from localhost.localdomain ([240e:46d:2100:3fed:6938:3f14:63eb:c479]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-cd654a3a592sm3688960a12.30.2026.10.18.23.42.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 18 Oct 2026 23:42:54 -0700 (PDT) From: Yafang Shao To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, eddyz87@gmail.com, memxor@gmail.com, mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, akpm@linux-foundation.org, david@kernel.org, gourry@gourry.net, tj@kernel.org, hannes@cmpxchg.org, mkoutny@suse.com, shakeel.butt@linux.dev, roman.gushchin@linux.dev, yu.c.chen@intel.com, zhao1.liu@intel.com, tim.c.chen@linux.intel.com, lizhe.67@bytedance.com Cc: bpf@vger.kernel.org, linux-mm@kvack.org, cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Yafang Shao Subject: [RFC PATCH v3 bpf-next 3/5] sched: add helpers for numa balancing Date: Mon, 19 Oct 2026 14:41:55 +0800 Message-ID: <20261019064157.29885-4-laoar.shao@gmail.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20261019064157.29885-1-laoar.shao@gmail.com> References: <20261019064157.29885-1-laoar.shao@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C642F40002 X-Stat-Signature: 6eawzzd98p7jfhzhcfrsxgzigu5m7dyb X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1792392176-442236 X-HE-Meta: U2FsdGVkX1/oNkXCC5ZiU5A8Hwkh9CwkO4HdsG7hVVdFUFChkaBIlOOVjWGRTrkFUNc/vwF78BMJCsdtqn3wGHlSTqHzf2gLVQVq+H+8OA6GgJtB0FMnkDKr+wDYoLLPwK1uIQ2RhukIw+ZACkbIiiMjj03VBrMvqxL0chCHoE0icSisOzQKlTUdODJXxcBRb3PkrzFnAZJHdQH5Zg/SqAEq48xmWsezxJ8mfJyZTxRS8bdWtsAks9s9xG2b4nyHRyu0rZY4srA+79vkRjK/mbRBhINEJzgYBl/5eA7H8s6/WoEMXfrE6t41BbnBFFA+pZVmA0rYkei1h4RqkYRgUMDx+HV47XSk9hKB82eVqzFEszVp432QimEIRH8SYALiJYQoBdg+MfVcegOUB7FSdeJAQWn86VxZEhiNRb77NTjbsZNxKXo4z/v0gszLealqLaI1ET+PnZpfVYTRbGb5zmhDJuQpHXXqAGPOPkQGLnTJKCHKr9RMic2Ofznwj8xHIk2AW26vFacFdpPXKeCKtY+nCK9b2CchzPYGxyM1ruIqk/eVS813w2i18uZ1acQ9IU64IJ2xWPo1fBD32XH3lDXK3Dc4dU0OLAat+0e5aH1A704m8Rv3EMhV3hakw0CTUq3JM9QgdOdJWNVH/+VkFBUlYx4QM5VF5UgFYN0gAJCvWi1a9qhZG6A7tClrG4BQf1Z5MSJyuOFDB0Qin3QwE0AIddvdImjI8/36hJHhk807Xia+KMUFH8v/IRBPdSIg0N4DGULe/84q5ADY8V4VSERcH1nSf9MvqWa/B+7N+RS/z8BP8+rWYJnImC9kBdvlVy5g+MvPG6YQkcmUMjVxbD4hpX0ReS9keWb5d/x5r1SWaeVrr1gY0wQAj9xZ6I5VhObSfc8Q2uMzpuet00kHZdgbdBaTavG9KLNAp6NqbLrmAuXfBsbZuhGYHLfcs8oNN0T7g1kKNAgxUxaLqMr q4w58b8l XolEz65wCSWHbb4rkhfwf5gqO2YM6TR3O1q1+UZKyf2L5IhFeZ8xEQ7EmC9Gcb/fbMJ0OzE075v5P9JCPwy+hWlHMjWCTlYVGpOqRo8FKaTMsjodAftnxB4TTP3vwXI7uz8wNzkqYT/dHZfD6KfqMcBLPjd/1NNrXLFNtpW8KmDDYcS+WWugIQYmGWokp15Fxsr/8Gy2YHqEYlDdevAj77w+kBCPj5W8wJCmOgFwvWxo+b4Pnqx2IudI1UIszUj+Lax8qtpq4DhdSDTU3OvkFz9+cjhp746RqrkgwAv94hwXgQNMbmwQzaHuBrJtd7JE3jykjWdy85MtC0dSo0aV5TyNYvUeS5dp+DL7bZ/CJ3S4gwztqqOyn8gGwpAh5uF3EQ745Z1/yr99YDmKoouNCosRAFP6eDzoVSIPRvwtnIU2N/lk0XrF+LuDRDAUSGVGVa0eWnZ631LPRqUKz/bukLpTI2q6afVZIQjw9ogVjar3E8W/SGydDVYeOK0aBD43TadEryzGNsQG/Byw= Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Three new helpers task_numab_enabled(), numab_in_tiering_mode() and numab_in_normal_mode() are introduced to replace the scattered direct accesses to the sched_numa_balancing static key and the sysctl_numa_balancing_mode bitmask. No functional change. Signed-off-by: Yafang Shao Cc: David Hildenbrand (Arm) --- include/linux/sched/numa_balancing.h | 33 ++++++++++++++++++++++++++++ kernel/sched/fair.c | 31 +++++++++++++------------- kernel/sched/sched.h | 1 - mm/memory-tiers.c | 3 ++- mm/mempolicy.c | 3 +-- mm/migrate.c | 7 +++--- mm/vmscan.c | 6 ++--- 7 files changed, 59 insertions(+), 25 deletions(-) diff --git a/include/linux/sched/numa_balancing.h b/include/linux/sched/numa_balancing.h index 52b22c5c396d..36de57f7fb06 100644 --- a/include/linux/sched/numa_balancing.h +++ b/include/linux/sched/numa_balancing.h @@ -8,6 +8,7 @@ */ #include +#include #define TNF_MIGRATED 0x01 #define TNF_NO_GROUP 0x02 @@ -32,6 +33,26 @@ extern void set_numabalancing_state(bool enabled); extern void task_numa_free(struct task_struct *p, bool final); bool should_numa_migrate_memory(struct task_struct *p, struct folio *folio, int src_nid, int dst_cpu); + +extern struct static_key_false sched_numa_balancing; + +/* Whether NUMA balancing applies to @p. */ +static inline bool task_numab_enabled(struct task_struct *p) +{ + return static_branch_likely(&sched_numa_balancing); +} + +/* Whether NUMA balancing is in memory tiering mode. */ +static inline bool numab_in_tiering_mode(void) +{ + return sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING; +} + +/* Whether NUMA balancing is in normal mode. */ +static inline bool numab_in_normal_mode(void) +{ + return sysctl_numa_balancing_mode & NUMA_BALANCING_NORMAL; +} #else static inline void task_numa_fault(int last_node, int node, int pages, int flags) @@ -52,6 +73,18 @@ static inline bool should_numa_migrate_memory(struct task_struct *p, { return true; } +static inline bool task_numab_enabled(struct task_struct *p) +{ + return false; +} +static inline bool numab_in_tiering_mode(void) +{ + return false; +} +static inline bool numab_in_normal_mode(void) +{ + return false; +} #endif #endif /* _LINUX_SCHED_NUMA_BALANCING_H */ diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 71dc47d6114d..066818498c76 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include @@ -1478,7 +1479,8 @@ static inline int get_sched_cache_scale(int mul) return (1 + (tol - 1) * mul); } -static bool exceed_llc_capacity(struct sched_cache_group *grp, int cpu) +static bool exceed_llc_capacity(struct sched_cache_group *grp, struct task_struct *p, + int cpu) { #ifdef CONFIG_NUMA_BALANCING unsigned long llc, footprint; @@ -1491,7 +1493,7 @@ static bool exceed_llc_capacity(struct sched_cache_group *grp, int cpu) if (!sd) return true; - if (static_branch_likely(&sched_numa_balancing)) { + if (task_numab_enabled(p)) { /* * TBD: RDT exclusive LLC ways reserved should be * excluded. @@ -1879,7 +1881,7 @@ static int get_pref_llc(struct task_struct *p, struct sched_cache_group *grp) * than sched_setnuma() at least -- and thus the * conflict only exists for a short period of time. */ - if (static_branch_likely(&sched_numa_balancing) && + if (task_numab_enabled(p) && p->numa_preferred_nid >= 0 && cpu_to_node(mm_sched_cpu) != p->numa_preferred_nid) mm_sched_llc = -1; @@ -1932,7 +1934,7 @@ void account_mm_sched(struct rq *rq, struct task_struct *p, s64 delta_exec) */ if ((long)(epoch - READ_ONCE(grp->epoch)) > llc_epoch_affinity_timeout || invalid_llc_nr(grp, p, cpu_of(rq)) || - exceed_llc_capacity(grp, cpu_of(rq))) { + exceed_llc_capacity(grp, p, cpu_of(rq))) { if (READ_ONCE(grp->cpu) != -1) WRITE_ONCE(grp->cpu, -1); } @@ -1980,7 +1982,7 @@ static void get_scan_cpumasks(cpumask_var_t cpus, struct task_struct *p, #ifdef CONFIG_NUMA_BALANCING int cpu, curr_cpu, nid, pref_nid; - if (!static_branch_likely(&sched_numa_balancing)) + if (!task_numab_enabled(p)) goto out; cpu = READ_ONCE(grp->cpu); @@ -2076,7 +2078,7 @@ static void task_cache_work(struct callback_head *work) curr_cpu = task_cpu(p); if (invalid_llc_nr(grp, p, curr_cpu) || - exceed_llc_capacity(grp, curr_cpu)) { + exceed_llc_capacity(grp, p, curr_cpu)) { if (READ_ONCE(grp->cpu) != -1) WRITE_ONCE(grp->cpu, -1); @@ -2963,8 +2965,8 @@ bool should_numa_migrate_memory(struct task_struct *p, struct folio *folio, this_cpupid = cpu_pid_to_cpupid(dst_cpu, current->pid); last_cpupid = folio_xchg_last_cpupid(folio, this_cpupid); - if (!(sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING) && - !node_is_toptier(src_nid) && !cpupid_valid(last_cpupid)) + if (!(numab_in_tiering_mode()) && !node_is_toptier(src_nid) && + !cpupid_valid(last_cpupid)) return false; /* @@ -4194,7 +4196,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags) struct numa_group *ng; int priv; - if (!static_branch_likely(&sched_numa_balancing)) + if (!task_numab_enabled(p)) return; /* for example, ksmd faulting in a user's mm */ @@ -4206,8 +4208,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags) * node for memory tiering mode. */ if (!node_is_toptier(mem_node) && - (sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING || - !cpupid_valid(last_cpupid))) + (numab_in_tiering_mode() || !cpupid_valid(last_cpupid))) return; /* Allocate buffer to track faults on a per-node basis */ @@ -4665,7 +4666,7 @@ static void update_scan_period(struct task_struct *p, int new_cpu) int src_nid = cpu_to_node(task_cpu(p)); int dst_nid = cpu_to_node(new_cpu); - if (!static_branch_likely(&sched_numa_balancing)) + if (!task_numab_enabled(p)) return; if (!p->mm || !p->numa_faults || (p->flags & PF_EXITING)) @@ -10697,7 +10698,7 @@ static long migrate_degrades_locality(struct task_struct *p, struct lb_env *env) unsigned long src_weight, dst_weight; int src_nid, dst_nid, dist; - if (!static_branch_likely(&sched_numa_balancing)) + if (!task_numab_enabled(p)) return 0; if (!p->numa_faults || !(env->sd->flags & SD_NUMA)) @@ -10960,7 +10961,7 @@ static enum llc_mig can_migrate_llc_task(struct lb_env *env, /* skip cache aware load balance for too many threads */ if (invalid_llc_nr(grp, p, dst_cpu) || - exceed_llc_capacity(grp, dst_cpu)) { + exceed_llc_capacity(grp, p, dst_cpu)) { if (READ_ONCE(grp->cpu) != -1) WRITE_ONCE(grp->cpu, -1); return mig_unrestricted; @@ -15351,7 +15352,7 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued) if (queued) return; - if (static_branch_likely(&sched_numa_balancing)) + if (task_numab_enabled(curr)) task_tick_numa(rq, curr); task_tick_cache(rq, curr); diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index e656c7059bf8..38e21c8c57dd 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2465,7 +2465,6 @@ extern struct static_key sched_feat_keys[__SCHED_FEAT_NR]; #endif /* !CONFIG_JUMP_LABEL */ -extern struct static_key_false sched_numa_balancing; extern struct static_key_false sched_schedstats; static inline u64 global_rt_period(void) diff --git a/mm/memory-tiers.c b/mm/memory-tiers.c index 54851d8a195b..9009b164edc2 100644 --- a/mm/memory-tiers.c +++ b/mm/memory-tiers.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include "internal.h" @@ -64,7 +65,7 @@ static const struct bus_type memory_tier_subsys = { */ bool folio_use_access_time(struct folio *folio) { - return (sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING) && + return numab_in_tiering_mode() && !node_is_toptier(folio_nid(folio)); } #endif diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 79053ece02cd..442c93079fb0 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -871,8 +871,7 @@ bool folio_can_map_prot_numa(struct folio *folio, struct vm_area_struct *vma, * Skip scanning top tier node if normal numa * balancing is disabled */ - if (!(sysctl_numa_balancing_mode & NUMA_BALANCING_NORMAL) && - node_is_toptier(nid)) + if (!numab_in_normal_mode() && node_is_toptier(nid)) return false; if (folio_use_access_time(folio)) diff --git a/mm/migrate.c b/mm/migrate.c index 15b45832bcfa..a622df9a9b42 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -818,7 +819,7 @@ void folio_migrate_flags(struct folio *newfolio, struct folio *folio) * memory node, reset cpupid, because that is used to record * page access time in slow memory node. */ - if (sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING) { + if (numab_in_tiering_mode()) { bool f_toptier = node_is_toptier(folio_nid(folio)); bool t_toptier = node_is_toptier(folio_nid(newfolio)); @@ -2718,7 +2719,7 @@ int migrate_misplaced_folio_prepare(struct folio *folio, if (!migrate_balanced_pgdat(pgdat, nr_pages)) { int z; - if (!(sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING)) + if (!numab_in_tiering_mode()) return -EAGAIN; for (z = pgdat->nr_zones - 1; z >= 0; z--) { if (managed_zone(pgdat->node_zones + z)) @@ -2770,7 +2771,7 @@ int migrate_misplaced_folio(struct folio *folio, int node) if (nr_succeeded) { count_vm_numa_events(NUMA_PAGE_MIGRATE, nr_succeeded); count_memcg_events(memcg, NUMA_PAGE_MIGRATE, nr_succeeded); - if ((sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING) + if ((numab_in_tiering_mode()) && !node_is_toptier(folio_nid(folio)) && node_is_toptier(node)) mod_lruvec_state(lruvec, PGPROMOTE_SUCCESS, nr_succeeded); diff --git a/mm/vmscan.c b/mm/vmscan.c index f11491ee9ed5..17455255fc30 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -65,6 +65,7 @@ #include #include +#include #include "internal.h" #include "page_alloc.h" @@ -5029,8 +5030,7 @@ static bool should_abort_scan(struct lruvec *lruvec, struct scan_control *sc) if (!current_is_kswapd() || sc->order) return false; - mark = sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING ? - WMARK_PROMO : WMARK_HIGH; + mark = numab_in_tiering_mode() ? WMARK_PROMO : WMARK_HIGH; for (i = 0; i <= sc->reclaim_idx; i++) { struct zone *zone = lruvec_pgdat(lruvec)->node_zones + i; @@ -6974,7 +6974,7 @@ static bool pgdat_balanced(pg_data_t *pgdat, int order, int highest_zoneidx) enum zone_stat_item item; unsigned long free_pages; - if (sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING) + if (numab_in_tiering_mode()) mark = promo_wmark_pages(zone); else mark = high_wmark_pages(zone); -- 2.52.0