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 CD8B3CE79A9 for ; Wed, 20 Sep 2023 03:07:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6DA156B00FD; Tue, 19 Sep 2023 23:07:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 68A366B00FE; Tue, 19 Sep 2023 23:07:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 579056B00FF; Tue, 19 Sep 2023 23:07:21 -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 470926B00FD for ; Tue, 19 Sep 2023 23:07:21 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 1DFBE41383 for ; Wed, 20 Sep 2023 03:07:21 +0000 (UTC) X-FDA: 81255489882.23.816DFF3 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by imf01.hostedemail.com (Postfix) with ESMTP id 7B5EA4000D for ; Wed, 20 Sep 2023 03:07:18 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=O0NXgT+U; spf=pass (imf01.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.20 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=1695179239; a=rsa-sha256; cv=none; b=PM4e77IFcmM5W+1SSyuJvsOWMz6lW1f01++VBw8q5mfZYiSbYzOIZ357L5AmEOFIM/QU7o lRdhyFU3CIreSrECkncKxXA+aY5gIpJB4XLEqYfmRFTj5XV91JNZVsJIJMfQhBKutjy632 7hFID8mG1kJyN6g5dA/1bzqV1wxIDYQ= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=O0NXgT+U; spf=pass (imf01.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.20 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=1695179239; 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=wLOy6AH35hgiBGdRmP3sn213T84eWK+zRxGMb6vYo2Q=; b=RM5hWx6g00HoEx8cfpN0PMVcsGde4JLuFYJDPuupBg8I4uUG+G/p9HW61s7rgpxFAjoCez 9ZiDYiVqpV18W1I+9uq11nfv7tR+QqFZUoKdOTKKMk2ixZXKogBu9SX92WFSxM445UKuCM 6pohZRDiKPX83J0Lb/B5YaVxOkGLTVg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695179238; x=1726715238; h=from:to:cc:subject:references:date:in-reply-to: message-id:mime-version; bh=wVwCa7de0uB/cIkohpBJsr4N51ML8Ja9GYUPeKKwzNI=; b=O0NXgT+UxifCsiZateuFxLlfsLiEubCQoeyizFQAEUmgRkThGdfa6hkt MNlq8nd18M9uVWpz3flRRJzcknXKCVzbKhTXAJVB1fbBcWn8UmcjPw/zV wUB545lqjOapcCjtlUxFmMwnYz7HFD4grbqe5e5ykMmdCEm+KzM9DaXyH n8kgOW7r6J5CvNyLW8mX/nwjXz+mQbiZRacdKxryXnaoFcaSSfvUqaaK8 EvoGbOwtha1R14DB9fC1oom+2K69XXA+ovhnqOJXVC26tHxalfMRM80Xk NGmLSKKnQOUc837vNH9F6ILO6YRobK9pNS7lKL+j24poUX70Woc3I1R/r A==; X-IronPort-AV: E=McAfee;i="6600,9927,10838"; a="370424488" X-IronPort-AV: E=Sophos;i="6.02,160,1688454000"; d="scan'208";a="370424488" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Sep 2023 20:07:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10838"; a="861798110" X-IronPort-AV: E=Sophos;i="6.02,160,1688454000"; d="scan'208";a="861798110" Received: from yhuang6-desk2.sh.intel.com (HELO yhuang6-desk2.ccr.corp.intel.com) ([10.238.208.55]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Sep 2023 20:07:13 -0700 From: "Huang, Ying" To: Kefeng Wang Cc: Andrew Morton , , , , , Zi Yan , Mike Kravetz , Subject: Re: [PATCH 1/6] sched/numa, mm: make numa migrate functions to take a folio References: <20230918103213.4166210-1-wangkefeng.wang@huawei.com> <20230918103213.4166210-2-wangkefeng.wang@huawei.com> Date: Wed, 20 Sep 2023 11:05:03 +0800 In-Reply-To: <20230918103213.4166210-2-wangkefeng.wang@huawei.com> (Kefeng Wang's message of "Mon, 18 Sep 2023 18:32:08 +0800") Message-ID: <87ttrpwnmo.fsf@yhuang6-desk2.ccr.corp.intel.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=ascii X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 7B5EA4000D X-Stat-Signature: ppygoo7atfmu5g1ewigd8mmwbwgq74s5 X-Rspam-User: X-HE-Tag: 1695179238-633599 X-HE-Meta: U2FsdGVkX1/vsCQLRGIqLNXq4FcG0VV0WFoscigiGX5JyT2TsxBVgbajsh5wIpW/116xU9dcRR8+V7ET8/fTQSPi+Kddtm8ksI48xj49EyjQ8fl1pj92ongGKYtuCcVnF/F8JLcm3Ne8XvI6YW+LqeUvnKqDsMSfsxxovJm4/LvG9XTw8+fY03kIkvH1VEG+hiHWyEUHCVxR6i0meyOwAi7z31qTT1v72flxiCVDorRWpg31kN2NxZzbcFC+K8m3lEm7Quvk8LU/8jF0Enuz+K6fXcKMx90JhyEuH4JwfP3DVAgnNzqcGBiueZ9p3+E0Tuv+aW43TPVCFNlTgMkSJtYc+9lolYFotVGTtAgZDYciOOkqQdsTkW8HSg+GFDTKBQZfIdu8pdabdGQLa7ApOcjETGbIwrBDtmbMyPkNEiUStqO9ffGy1GjP8CxsBSMA+Rrl/fZ+UHAkBzk3QiCAgWCy91JnUt6KX3mQoFBgMJaX9CIhpY5OJIJ/xe1VdTNIok5nBr1wDCTaTz48HrJc+N0b+UoB37IOvjXCE6ixTmYdbqEZC5fZz81nMKCI0pMsINvKvI1bNsye6MFajXCZHS0mgviSj2dYS6i0uKqDxIGVFyao30lV+cDd4qTlt+YUXmaBwFslVubQ+kOzegqnIK8FYRXy02V4B1ZxS6C5xtJjrHN8JKmWh5Hmsv+WXrzXX2TxY2GTE3CvWl47kXPs4pHl55al1C1SNS5lOj2D3/ZIcAKxlub5627wmrq2nvDlioNUD0MlIGuDc86HwXLTy/mPwZgM0s7D3RcWjr0mJ8imhQ+BNNRrSUuxhd6yer/fyM1uFyeCeDdzT6KJFB13pv80YzwFgeNEHsy/px5Iy3BxeznDTIde/Xlglj1gb2IS0ZRCVSOW/hShcZxgsonU9I0lIGsnpvWsTiz7ipMxnwYnHbWXjRWMS7ibxL2p8L9HhfJ8RBIoNXBtCw3gJBS yqikb4yd r6rRgOpN+YtDcUEv7/K8xwdpDQcEcVslkIdrNwLfkps1ich0GfKdXKKGCDg+toHcUmFDrIDfQf18RFOpWfIhZ2Q6KFRx/Omesv3u4NrdqYGoOhvK12HiBVMK1Q3z7rku6+K+serPps+z21B+4dTiKqTGwbql3oNqwf7MwDvIQ92tWnWY= 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: Kefeng Wang writes: > The cpuid(or access time) is stored in the head page for THP, so it is s/cpuid/cpupid/ > safely to make should_numa_migrate_memory() and numa_hint_fault_latency() > to take a folio. This is in preparation for large folio numa balancing. > > Signed-off-by: Kefeng Wang > --- > include/linux/sched/numa_balancing.h | 4 ++-- > kernel/sched/fair.c | 12 ++++++------ > mm/mempolicy.c | 3 ++- > 3 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/include/linux/sched/numa_balancing.h b/include/linux/sched/numa_balancing.h > index 3988762efe15..a38528c28665 100644 > --- a/include/linux/sched/numa_balancing.h > +++ b/include/linux/sched/numa_balancing.h > @@ -20,7 +20,7 @@ extern void task_numa_fault(int last_node, int node, int pages, int flags); > extern pid_t task_numa_group_id(struct task_struct *p); > extern void set_numabalancing_state(bool enabled); > extern void task_numa_free(struct task_struct *p, bool final); > -extern bool should_numa_migrate_memory(struct task_struct *p, struct page *page, > +extern bool should_numa_migrate_memory(struct task_struct *p, struct folio *folio, > int src_nid, int dst_cpu); > #else > static inline void task_numa_fault(int last_node, int node, int pages, > @@ -38,7 +38,7 @@ static inline void task_numa_free(struct task_struct *p, bool final) > { > } > static inline bool should_numa_migrate_memory(struct task_struct *p, > - struct page *page, int src_nid, int dst_cpu) > + struct folio *folio, int src_nid, int dst_cpu) > { > return true; > } > diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c > index cb225921bbca..683cc1e417d7 100644 > --- a/kernel/sched/fair.c > +++ b/kernel/sched/fair.c > @@ -1722,12 +1722,12 @@ static bool pgdat_free_space_enough(struct pglist_data *pgdat) > * The smaller the hint page fault latency, the higher the possibility > * for the page to be hot. > */ > -static int numa_hint_fault_latency(struct page *page) > +static int numa_hint_fault_latency(struct folio *folio) > { > int last_time, time; > > time = jiffies_to_msecs(jiffies); > - last_time = xchg_page_access_time(page, time); > + last_time = xchg_page_access_time(&folio->page, time); How about define xchg_folio_access_time() and folio_cpupid_xchg_last()? -- Best Regards, Huang, Ying > > return (time - last_time) & PAGE_ACCESS_TIME_MASK; > } > @@ -1784,7 +1784,7 @@ static void numa_promotion_adjust_threshold(struct pglist_data *pgdat, > } > } > > -bool should_numa_migrate_memory(struct task_struct *p, struct page * page, > +bool should_numa_migrate_memory(struct task_struct *p, struct folio *folio, > int src_nid, int dst_cpu) > { > struct numa_group *ng = deref_curr_numa_group(p); > @@ -1814,16 +1814,16 @@ bool should_numa_migrate_memory(struct task_struct *p, struct page * page, > numa_promotion_adjust_threshold(pgdat, rate_limit, def_th); > > th = pgdat->nbp_threshold ? : def_th; > - latency = numa_hint_fault_latency(page); > + latency = numa_hint_fault_latency(folio); > if (latency >= th) > return false; > > return !numa_promotion_rate_limit(pgdat, rate_limit, > - thp_nr_pages(page)); > + folio_nr_pages(folio)); > } > > this_cpupid = cpu_pid_to_cpupid(dst_cpu, current->pid); > - last_cpupid = page_cpupid_xchg_last(page, this_cpupid); > + last_cpupid = page_cpupid_xchg_last(&folio->page, this_cpupid); > > if (!(sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING) && > !node_is_toptier(src_nid) && !cpupid_valid(last_cpupid)) > diff --git a/mm/mempolicy.c b/mm/mempolicy.c > index 42b5567e3773..39584dc25c84 100644 > --- a/mm/mempolicy.c > +++ b/mm/mempolicy.c > @@ -2642,7 +2642,8 @@ int mpol_misplaced(struct page *page, struct vm_area_struct *vma, unsigned long > if (pol->flags & MPOL_F_MORON) { > polnid = thisnid; > > - if (!should_numa_migrate_memory(current, page, curnid, thiscpu)) > + if (!should_numa_migrate_memory(current, page_folio(page), > + curnid, thiscpu)) > goto out; > }