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 CD644C2BD09 for ; Fri, 12 Jul 2024 06:29:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5F98B6B0088; Fri, 12 Jul 2024 02:29:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A9E36B008A; Fri, 12 Jul 2024 02:29:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 499326B0092; Fri, 12 Jul 2024 02:29:57 -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 2B7616B0088 for ; Fri, 12 Jul 2024 02:29:57 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id CE345120919 for ; Fri, 12 Jul 2024 06:29:56 +0000 (UTC) X-FDA: 82330125192.10.EB84FFE Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) by imf29.hostedemail.com (Postfix) with ESMTP id D617712001B for ; Fri, 12 Jul 2024 06:29:53 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=aFyh12Bq; spf=pass (imf29.hostedemail.com: domain of ying.huang@intel.com designates 198.175.65.13 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720765768; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=yB+oBVR6U46z4uRfUI464gyf5NdI+KrbFmvZt9D9rLo=; b=aEsTP8qQ8+BmWuoIFFbsGA3CIEG80RqyunmyZFWMwY0FuAcJbiuwiYVF7iDf85TwMshT6D o3rL6dPgIMh0U9KuoMo/NlIDvdqqdBeDF9ONcL2RRJnPUcDvWQL5D3yf9cEISDLisRPGsZ tbfBrhPCcZ35o/r2GElAjAx6Ak2vux0= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=aFyh12Bq; spf=pass (imf29.hostedemail.com: domain of ying.huang@intel.com designates 198.175.65.13 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720765768; a=rsa-sha256; cv=none; b=21ycyMZZW48A6TUJ7R3z9qoh6gaIBqIrF6goMgmKMiu0koUOTcW4/l2VtwpvWTMZ8gBeZC v2itD+jHhEoJcub1tdTjZULz91UHnEX5vqlNwu8jsf1yTtpx44kcmzZvDMA4v1uF337ouB p6J0/nKjjGeWzzjOpLDdtVOArxvNedE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720765794; x=1752301794; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=mftHE/QeNr6HnahxP6N5M6hsdpF/qFxGbp6B0PMSRsE=; b=aFyh12BqJGWMU8VVVdXtQD0YcikmRvZdvIQ1VM1M+frHh+jmgzTxU25A KOrx8RYOlADUtYFZWvhbkyg784+YpeNMEHYrgsIU5LrY6Dcx9Mwx8zCSV HsQsdjzQhjZ0SYEAn1jeBf93REg2UCGbaWe26pOKr+QnhQdZ3+9IemIJV fNW0iPNsvMFIXbK1oGhXL7zYe9XjbRSTgajp/tOeGqMtNYEhTxq1zCGvQ vHJ6apdYzIuyI+wrSwK78BHgqBQzDdILJmRz0t0vT8ji8/Vt+31cMWvPJ mer4Nv4XDd+hs4//332Su75WdLO04JDfQde3On2kJR6p0c+FPwSOdxDDs A==; X-CSE-ConnectionGUID: oQlz/CoJQ9SL6SNzjHdrLA== X-CSE-MsgGUID: mIWhBgjJTkG0aYJ5HT+XKA== X-IronPort-AV: E=McAfee;i="6700,10204,11130"; a="29343130" X-IronPort-AV: E=Sophos;i="6.09,202,1716274800"; d="scan'208";a="29343130" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2024 23:29:53 -0700 X-CSE-ConnectionGUID: mOhgefi9SASqp2u152Obig== X-CSE-MsgGUID: 9uswyLFpQfWQZuvGnx8xHg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,202,1716274800"; d="scan'208";a="86315535" Received: from unknown (HELO yhuang6-desk2.ccr.corp.intel.com) ([10.238.208.55]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Jul 2024 23:29:50 -0700 From: "Huang, Ying" To: Zi Yan Cc: David Hildenbrand , linux-mm@kvack.org, Zi Yan , Andrew Morton , Baolin Wang , linux-kernel@vger.kernel.org Subject: Re: [RFC PATCH 2/3] memory tiering: introduce folio_has_cpupid() check In-Reply-To: <20240712024455.163543-3-zi.yan@sent.com> (Zi Yan's message of "Thu, 11 Jul 2024 22:44:54 -0400") References: <20240712024455.163543-1-zi.yan@sent.com> <20240712024455.163543-3-zi.yan@sent.com> Date: Fri, 12 Jul 2024 14:27:59 +0800 Message-ID: <878qy786q8.fsf@yhuang6-desk2.ccr.corp.intel.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=ascii X-Stat-Signature: 8ak9j8d16bwizajuzxqjz1sauiqm5sin X-Rspam-User: X-Rspamd-Queue-Id: D617712001B X-Rspamd-Server: rspam02 X-HE-Tag: 1720765793-222485 X-HE-Meta: U2FsdGVkX19+3/+kXZyYtPZsevHhee23DMrC6VTpMWfEr3qCXAiQ2qwicsFD4PjdWO67rko3hhmXWnzzvFDW6e7h/2jyyRzzq+peaKbbakjiQJdUI68JS0YDqmAZFn7Y7J25GImQjYCOX/tMP0DCfX/009e6oo3K2HtyavmnKMuRuBRqDK2R2qlSIon2YPB+R2iGUzW++6ngfTjLV490ntRYo8oNNGjHziJtwPJllhgf1v8SrikL9IMV2qNtyzkEJv1utuO8NUPG9effNger5jZm+7yXI/XqqkBVYzb10QzED2qYWal/TOspwwPpo/QdliOmxqHCFXBnAHXZ9HQ1utZUSvIXdAyViahCYYx2nZ1adeh5tY5IJsrgmSd7fWJgiZanVBRmgxppvXwpyKjkbuAKqp/53s+lpFE44HjAzRiTyK45YB5I6MRLq5C+iBspGBg1mvS1eSG6OjEtX2iG6JBmTpn5/X0LivvCmUsuupFTywJis4PRsYwNxSu9XT4OlcK/Z2hcwP+iFNCTJ5fwcHcEFB/tVUFZ/al99/x2R9OJOreBNa9RD0zlz91O4wrst3SITcQSpATjWZx0LmIEbSwvYn2CCilbnXZ0JKbUUkqoQd164oHW48s+9sOixtkDm8zHM6PBvuOmS6402aEo39SeRHruPbd9Nl0QglbevpQAEFKp/HzdNRQEK2plS81H3hCZXpD6Z5cs9gE6kpiaKRt45kemvbTj9ETsKWjPl087Iv8n04+ospnqUHRvOgm3HmbC6An4V+SFM22QPiwVP00kGCVjC2xkBk5ITFgqVze8jTCefG61mOzLQzV/hxmrXYZ4ljWQOzZzKlkoMTrYr+aWeqlaEHDXPs80f6C+GfbHdnVN/lChFnGLrjDAihUi3IiXF5k/2z32/YouTSCtxAaPpJpXrGLOH2F4DvuYC/Ynq5YzgqrshVldU9mx91167ecGlrNwKjGL25Yiw2z h8Bf8tCo XKaMM1YxJfEt2HdrslsAeNCXJRFQojMEEiEL2Mwq1DUGJCuPor1Xus41fDCUkr8VNWtehOeYEsK2ZKfLjgjRWJ3q3Wc2on6YAzERac/ixPUAaAyjeEOHxJCUuG5nzDaDFPbe39pazFJX1pcViKgpfQCp5rVhjRxYj8qQN0l9U8shiqi3UVLX+Fzw/+P7yBl56WYrz2nKsdaxRwx0kjROPbqKNHrN1hV5SGModyTmpgLm7KfNyRT/X8Z/7DYD35wweyhYoYdKQwFHOIRXHXNJD2SiVR7sakcPrfkHmkwUWzKTZdmyorHy8/Dr2Eg/i34fupKE0 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: Zi Yan writes: > 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 LGTM, Thanks! Feel free to add Reviewed-by: "Huang, Ying" in your future versions. > --- > 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)); > }