From patchwork Fri Jul 12 02:44:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zi Yan X-Patchwork-Id: 13731252 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 0E2A1C3DA49 for ; Fri, 12 Jul 2024 02:45:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2BA4E6B009A; Thu, 11 Jul 2024 22:45:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 21D636B009C; Thu, 11 Jul 2024 22:45:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 06EFE6B009B; Thu, 11 Jul 2024 22:45:12 -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 DFCAB6B0099 for ; Thu, 11 Jul 2024 22:45:11 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 994A01407A9 for ; Fri, 12 Jul 2024 02:45:11 +0000 (UTC) X-FDA: 82329558822.12.1A26719 Received: from fhigh3-smtp.messagingengine.com (fhigh3-smtp.messagingengine.com [103.168.172.154]) by imf27.hostedemail.com (Postfix) with ESMTP id 9360940013 for ; Fri, 12 Jul 2024 02:45:09 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=sent.com header.s=fm2 header.b=nZefoTlK; dkim=pass header.d=messagingengine.com header.s=fm2 header.b="M TIp+Eg"; spf=pass (imf27.hostedemail.com: domain of zi.yan@sent.com designates 103.168.172.154 as permitted sender) smtp.mailfrom=zi.yan@sent.com; dmarc=pass (policy=none) header.from=sent.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720752292; a=rsa-sha256; cv=none; b=kpEidhAH5damv/6cU6i+6GEVGHSVh8qkgpU4pVmHJ6iF4Da1qGo72vZon8YR6y0e42KopF PNpsHL5EY8ZrIPLFo9jOsxFR3+YRkEAhfLxO7yBN5l/zIt1CFswUkBFY4AB5eHT3Z22+aR wHYCbGwfR4kf4l8o3glaFkgpa+uHyNU= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=sent.com header.s=fm2 header.b=nZefoTlK; dkim=pass header.d=messagingengine.com header.s=fm2 header.b="M TIp+Eg"; spf=pass (imf27.hostedemail.com: domain of zi.yan@sent.com designates 103.168.172.154 as permitted sender) smtp.mailfrom=zi.yan@sent.com; dmarc=pass (policy=none) header.from=sent.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720752292; h=from:from:sender:reply-to: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=to4wnXa/PHhQKWIeEkU0XgFAJrxVOY/Z7C32sHOwamo=; b=2BeONkQuLPSjAB777Y5l23qXRCKETmJM2xWZO/MrJfcO8ciSZ19TvUiKPUZCNQHdcRivoM AipaKIuKrW4wW+aG2YLhMKn9ujyShDj0kLMpUy0f7mzCXSD+Ck7V4HSQ9WGzTdrethaCO8 cvezlH54YTcjF/8rW3KNvuPrlA7JXYk= Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailfhigh.nyi.internal (Postfix) with ESMTP id DC88711403D2; Thu, 11 Jul 2024 22:45:08 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 11 Jul 2024 22:45:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sent.com; h=cc :cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:reply-to:subject:subject:to:to; s=fm2; t=1720752308; x=1720838708; bh=to4wnXa/PHhQKWIeEkU0XgFAJrxVOY/Z7C32sHOwamo=; b= nZefoTlKwQe9WlVRNw7pzFUFeLBTgJkzPIKJJcV7IkC8gOOEOkpF/+sUO4S9C4Jk 1C2FaybJ4DXMwA7Pez1e80TZ3vZc8awY36g8T3RuZtpvx92qWbrUohOL6q1juGt5 5ZXBFk0mcJsAFUMM+IkE4Rjs8GjRRdll7kSkl+v6VlXTMr3wPoPl6TMEp5VY3NfV WEBOxvHbTZSM/rFmP/EhwvWIP5kXhcFPP0HV/6EOI0mJq5VQHyfUQBWIRC8/wiiG KTjRsswYWjfhH6w/2cZ1cagkZx43LbrJAHHgUPP0WaqqEJcVkKE+R8C/EYAFiCA6 KdNztpxOHA3QrIjFj5GURA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1720752308; x= 1720838708; bh=to4wnXa/PHhQKWIeEkU0XgFAJrxVOY/Z7C32sHOwamo=; b=M TIp+Eg20hq6uumef+91PiN0qYVH0tM/c8uB8w49KQCgTFTGrGtWPWdZe15NWsy6n T0AA5SOVHVb9WJKmUZoI4mmIHgcTavU/OFrpxgZdneIAOfE2kwsFTLxBoj3xq7ql UwC/ALDV6I/LMKPKwn7XUD1g31YN8bzInB5V2FdVVBX54OGWcLIYfuyyd1nOybWL 8bI1hXYwvT+OMpNzRJQuWYHV74FdETCbCSSSx8Fy352mPoWFqzigFMv0TC0pkTV0 hH3VPQXGcus4psENBuTi/tiMXGh/nqRVyAbipDYxmCLqpQ0TFdz3s14ZXIq9Vy/n p/NKrviCBDq2kFrzFVFgg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrfeehgdeigecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfrhgggfestdekredtredttdenucfhrhhomhepkghiucgj rghnuceoiihirdihrghnsehsvghnthdrtghomheqnecuggftrfgrthhtvghrnhepudfgfe elhfekiefgtedvudfghfduffefieefffejvefhlefhhffgkedtfeevhfevnecuvehluhhs thgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepiihirdihrghnsehsvg hnthdrtghomh X-ME-Proxy: Feedback-ID: iccd040f4:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 11 Jul 2024 22:45:07 -0400 (EDT) From: Zi Yan To: David Hildenbrand , "Huang, Ying" , linux-mm@kvack.org Cc: Zi Yan , Andrew Morton , Baolin Wang , linux-kernel@vger.kernel.org Subject: [RFC PATCH 2/3] memory tiering: introduce folio_has_cpupid() check Date: Thu, 11 Jul 2024 22:44:54 -0400 Message-ID: <20240712024455.163543-3-zi.yan@sent.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240712024455.163543-1-zi.yan@sent.com> References: <20240712024455.163543-1-zi.yan@sent.com> Reply-To: Zi Yan MIME-Version: 1.0 X-Stat-Signature: rufu83g77azqufgksrjz3tyojxtbzc9d X-Rspamd-Queue-Id: 9360940013 X-Rspam-User: X-Rspamd-Server: rspam10 X-HE-Tag: 1720752309-983918 X-HE-Meta: U2FsdGVkX1/KbiI5T4K5WNIG9v8KW3/r/MICa3OYpulqcW60Gkit1APHr1Lr+DrSBdwRrkoH7k3lDw0Ogz520UJKnapG/z6LVlblzIQKt8nJGRVfRqZcee5zTK/asi9/L8MUfvlSycPVFxiTUQMaaYFaChyIpP3LeaRUu+yuKgzT6cTsvB+F1cx2shmh1r27kDe9i7r3ePTusgpHaLqR2vd6y/8sMIk5DVsh2hcjQ+YNQyx49yXdVO/FopelEeyRRKbfvwxKw/MjnZUsMgYbdQ0NO714oJ94xUzpdzgaoAsNTkx7Y7tGJixaI34GrDXlKWV4EoopNLfcgRp+42NF223z2s7AQhDV4PUZhOyKfPipaA7KE9wBB0Dp2D6EVR6ZLBHbzCgj83etJuMZO6lLd2CFeoAC6lZMN3YLFtkzI0mco7hpYeEtEYNJOIqkhhfRKO6PGsQRLO6rkpD3fE2rd77gxicaWKUrCbX7qmAkBTKrnXOubKL0CjWoKgrs9UMhfNkSWOz71iF3AR49V1Y4POj4ouPHTwpJ3M8heK7Dogwlpk3G+MfZ+1nkfJmLR8AiLM65oeej4Ciy/wMHBUtaBcWdymFegUBHP3ox0NHqmBBbQYai5xWx0zmhPBfZKfNIuKirxZFSgj/xP2kWKBZGCXs9mAIOD/HpHi5EIcn7E1+HKQz57aDMoBniKAr3bGCDQEqYVPxLK2xTYUKbFmiCDQMW9T7T0jHEsb2IjpsT76X79FiGzarDxogLtUG1naw3NT261cwp1tJkrWk/STrRUp+k/SrPlTr/dFu5I9NChNb0QocNyqf5dnfkycQ37a0VvRI+IXtgD17tYUvT5Qwn0EP0Rc5sx69jW0HSOnU9YoIX0Oii8uN11qDRGZXYLSPk3bSMRe7q2hxUQsnQz/J2Px4uj+pfsDosE1F6Jv0YwlGy9UHP1onoibb4hkVTLVr/dxrX+dp5iCC/1yR6ob0 1DV00PBP ZYp/99pm80JV3IT7wMhlBvI2HGStX+NOHDHMyQD0t+245rYwVC9inedm33u7hf9zH1AYE6FPXLGcSx1FUQ6Sp1BERNe/SY8ro1Ydr3Hd5AJDCA8SC0ips1I4Gh8YDAT0zFhZ3eq1hA/pV/wcW4W9OvfcgZVX1xMbOrkNOpUqOjp9JsFy8pRQrNuGAWwLiWWqQSlHIskbb/A7a4v3Y1JqHIC4DhsCVF1iHFo+zqevJtXCy4sAf58bv8LFy1gfxsbYUkI9yQ+Sp9kzgLVelfjwMAsLIrp/Ey9mZG5C4hXLgsUp/4bPMdk4Z5kUCMAhnaK/l8KFds8OxubCPUdHiaHXPqJLFP73ecZmqZ0KlU0oHBE+R6EhrzkaBjfTcnX/kb55vSNsQCznGPWPiEx5MR8+lp3kcz1d8HojPMvy9t9qgY3FX0KiDC+DXEt13g3IwaN0XhNU1JNPA4Ie/Njc5Cf7MrfIk0fnEp3nMbfGzWNkm9IqKSX0= 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: From: Zi Yan Instead of open coded check for if memory tiering mode is on and a folio is in the top tier memory, use a function to encapsulate the check. Signed-off-by: Zi Yan Reviewed-by: "Huang, Ying" --- include/linux/memory-tiers.h | 8 ++++++++ kernel/sched/fair.c | 3 +-- mm/huge_memory.c | 6 ++---- mm/memory-tiers.c | 17 +++++++++++++++++ mm/memory.c | 3 +-- mm/mprotect.c | 3 +-- 6 files changed, 30 insertions(+), 10 deletions(-) diff --git a/include/linux/memory-tiers.h b/include/linux/memory-tiers.h index 0dc0cf2863e2..10c127d461c4 100644 --- a/include/linux/memory-tiers.h +++ b/include/linux/memory-tiers.h @@ -73,6 +73,10 @@ static inline bool node_is_toptier(int node) } #endif + +bool folio_has_cpupid(struct folio *folio); + + #else #define numa_demotion_enabled false @@ -151,5 +155,9 @@ static inline struct memory_dev_type *mt_find_alloc_memory_type(int adist, static inline void mt_put_memory_types(struct list_head *memory_types) { } +static inline bool folio_has_cpupid(struct folio *folio) +{ + return true; +} #endif /* CONFIG_NUMA */ #endif /* _LINUX_MEMORY_TIERS_H */ diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 8a5b1ae0aa55..03de808cb3cc 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -1840,8 +1840,7 @@ bool should_numa_migrate_memory(struct task_struct *p, struct folio *folio, * The pages in slow memory node should be migrated according * to hot/cold instead of private/shared. */ - if (sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING && - !node_is_toptier(src_nid)) { + if (!folio_has_cpupid(folio)) { struct pglist_data *pgdat; unsigned long rate_limit; unsigned int latency, th, def_th; diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 07d9dde4ca33..8c11d6da4b36 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1705,8 +1705,7 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf) * For memory tiering mode, cpupid of slow memory page is used * to record page access time. So use default value. */ - if (!(sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING) || - node_is_toptier(nid)) + if (folio_has_cpupid(folio)) last_cpupid = folio_last_cpupid(folio); target_nid = numa_migrate_prep(folio, vmf, haddr, nid, &flags); if (target_nid == NUMA_NO_NODE) @@ -2059,8 +2058,7 @@ int change_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, toptier) goto unlock; - if (sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING && - !toptier) + if (!folio_has_cpupid(folio)) folio_xchg_access_time(folio, jiffies_to_msecs(jiffies)); } diff --git a/mm/memory-tiers.c b/mm/memory-tiers.c index 4775b3a3dabe..7f0360d4e3a0 100644 --- a/mm/memory-tiers.c +++ b/mm/memory-tiers.c @@ -6,6 +6,7 @@ #include #include #include +#include #include "internal.h" @@ -50,6 +51,22 @@ static const struct bus_type memory_tier_subsys = { .dev_name = "memory_tier", }; +/** + * folio_has_cpupid - check if a folio has cpupid information + * @folio: folio to check + * + * folio's _last_cpupid field is repurposed by memory tiering. In memory + * tiering mode, cpupid of slow memory folio (not toptier memory) is used to + * record page access time. + * + * Return: the folio _last_cpupid is used as cpupid + */ +bool folio_has_cpupid(struct folio *folio) +{ + return !(sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING) || + node_is_toptier(folio_nid(folio)); +} + #ifdef CONFIG_MIGRATION static int top_tier_adistance; /* diff --git a/mm/memory.c b/mm/memory.c index dceb62f3fa34..96c2f5b3d796 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5344,8 +5344,7 @@ static vm_fault_t do_numa_page(struct vm_fault *vmf) * For memory tiering mode, cpupid of slow memory page is used * to record page access time. So use default value. */ - if ((sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING) && - !node_is_toptier(nid)) + if (!folio_has_cpupid(folio)) last_cpupid = (-1 & LAST_CPUPID_MASK); else last_cpupid = folio_last_cpupid(folio); diff --git a/mm/mprotect.c b/mm/mprotect.c index 222ab434da54..787c3c2bf1b6 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -161,8 +161,7 @@ static long change_pte_range(struct mmu_gather *tlb, if (!(sysctl_numa_balancing_mode & NUMA_BALANCING_NORMAL) && toptier) continue; - if (sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING && - !toptier) + if (!folio_has_cpupid(folio)) folio_xchg_access_time(folio, jiffies_to_msecs(jiffies)); }