From patchwork Tue Sep 26 00:52:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13398587 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 772E0E81807 for ; Tue, 26 Sep 2023 00:53:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C7F588D005D; Mon, 25 Sep 2023 20:53:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C09118D0005; Mon, 25 Sep 2023 20:53:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A823F8D005D; Mon, 25 Sep 2023 20:53:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 9B76A8D0005 for ; Mon, 25 Sep 2023 20:53:19 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 68F17C0D75 for ; Tue, 26 Sep 2023 00:53:19 +0000 (UTC) X-FDA: 81276924918.05.8A0433B Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by imf30.hostedemail.com (Postfix) with ESMTP id 1D9BC80006 for ; Tue, 26 Sep 2023 00:53:15 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695689596; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iGP1uZCLGGtg16MJd/pOyCwveUPyD+uTEMShphh8Lhg=; b=JSFinvScqCAgdve4RrQjjljHKDF977s81VBUQI0CTohJERPigpIFXKbr/BkFtM0K+Co0jf TaUhvZPmoHrjONVogbM7PFYs6toPYIckH6kGeBJ6cm+5o7lklp+m1rE4992Ccht0qFZ2D3 lWIJjXwIZXbL0yfpslP2/cuj9yt8XJQ= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.255 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695689596; a=rsa-sha256; cv=none; b=viabk9k60KarP10sNrq/iRcLyL+NvTaaalFXP1NED8WER5IgLY5lgnyW+8mZubGcCtDI+9 MpImwCP0Hck60PoGgdBMy05yIhY+MVs9Y3qjJkpWNnJ4vo4qAlUBshzcFUyBtj5ocQmHzS RVEV1CmQa9K99yQVGZ71OtJEDFn6OHg= Received: from dggpemm100001.china.huawei.com (unknown [172.30.72.57]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4Rvh4f4Jj7z15NQw; Tue, 26 Sep 2023 08:50:58 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemm100001.china.huawei.com (7.185.36.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Tue, 26 Sep 2023 08:53:11 +0800 From: Kefeng Wang To: Andrew Morton CC: Mike Rapoport , Matthew Wilcox , David Hildenbrand , , , , Zi Yan , Kefeng Wang Subject: [PATCH -next 7/9] mm: convert page_cpupid_xchg_last() to folio_cpupid_xchg_last() Date: Tue, 26 Sep 2023 08:52:52 +0800 Message-ID: <20230926005254.2861577-8-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230926005254.2861577-1-wangkefeng.wang@huawei.com> References: <20230926005254.2861577-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm100001.china.huawei.com (7.185.36.93) X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 1D9BC80006 X-Rspam-User: X-Stat-Signature: jqdrtoj57hfr6pyjf6q7thctamoyiici X-Rspamd-Server: rspam01 X-HE-Tag: 1695689595-913301 X-HE-Meta: U2FsdGVkX1/oMdQOG8+t2haWOMkcC2phu/SfFMEGWySC0B58+4J7QUMstYaevm4iMvKkvVvyhD7+86BlM86nKxTRujMVtnfa4C0zGQopVq5rhNOZQebGHRx2zDiPLmBCQBEI+L/ZDlXeSD7XTrGw1gyqt3OZil6nROMeth40RKu65y5Kvr9jngqJGjjv4F5K2pgtYtVGuooxT9MRet0kWI33i3Ini4R1hUM2/IKpo6B1bTiFF4yM2skvk5RGOknBnvX2z7EcoTzGt6YKXCqSCU6QlrSvP+j5Ps0K21PVWDBlGlhNrxLUcO0CvvX0bTAYpWVU67jkGKJHnTt0v1IyN59jP5Dg//GJ+EYADpTgO8wGppR3akHZ9qc/Mtan7gB4Y0XaHhhhTXSMA1cZGhXQmj1jMYjQWwT7zUT3OfWfsTcS2jDssAolYnEnglHxUTfE5kdHcpf8tnyQubKzcQ2rPbgilKpgDbiIQJASSq0HVpOxGn76BL+zGWXJUzTNP1OOcjhCjdvRO9/Hu6B9qHXK+SB3cVSPKIdfq16Fr/SMSPkgasl0Rw/RRMCxxxxE0dOpAiIy4QRgSX2Ptr/c3rcA2iMZDC8lclQ7vZF5AOZCKzhVgPJ8txsO4OadetYSO4SZLISoOnYDLBpD4JqZGjzzSoMfp72DUX4DkkhxRqy5gJfZs4QOOBGAmwUiVUswUQ73RGFf/WxXz80Fv1Q3ol0ram4+Yq5fwyFR9wtFrcEfuU8eWnIA0oaIJlaZDbMFMK7awLiW/KW4aT09Q7Ye8zuzHlLhkSJJi77ys09AyJSegaj3UrizXfY4KC08zZvZz40k651HkpLyW8yn+1R4xJ/5PjwBFU1mqvFCGFnikOri6kXVFmVzCcRxwi25KJB0TWVWPlSVRLEp2rOuxJSGv1syunstsg8MlA+8LqDQ3X3alTHcMcDRtJ6xdMVPNDxU5dIsDYe5CSm/2trL6C/j9YL h/nSHaIe Gzuc1RciRxv8z2Kss+o8zT+wza/p1qFno241atBRRrekKpW9DVZ9SeEAknXVasjDforW68XQIVImGy/r6s+oYZlgSpEwYZ5Spwb54rQQM6YoakmJpaG+zhYBKrDoVjmkCT9geaM+77miD8+MMN/VSPvLCHodsSt3Hm50BhUnsLNCfdABxthwkQQSLN5RREW6ikDCA 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: Make page_cpupid_xchg_last() to take a folio, and rename it to olio_cpupid_xchg_last() since all callers with a folio. Signed-off-by: Kefeng Wang --- include/linux/mm.h | 14 +++++++------- kernel/sched/fair.c | 2 +- mm/huge_memory.c | 2 +- mm/memory.c | 2 +- mm/migrate.c | 4 ++-- mm/mmzone.c | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 9933f6345e66..a6f4b55bf469 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1683,9 +1683,9 @@ static inline bool __cpupid_match_pid(pid_t task_pid, int cpupid) #define cpupid_match_pid(task, cpupid) __cpupid_match_pid(task->pid, cpupid) #ifdef LAST_CPUPID_NOT_IN_PAGE_FLAGS -static inline int page_cpupid_xchg_last(struct page *page, int cpupid) +static inline int folio_cpupid_xchg_last(struct folio *folio, int cpupid) { - return xchg(&page->_last_cpupid, cpupid & LAST_CPUPID_MASK); + return xchg(&folio->_last_cpupid, cpupid & LAST_CPUPID_MASK); } static inline int folio_cpupid_last(struct folio *folio) @@ -1702,7 +1702,7 @@ static inline int folio_cpupid_last(struct folio *folio) return (folio->flags >> LAST_CPUPID_PGSHIFT) & LAST_CPUPID_MASK; } -extern int page_cpupid_xchg_last(struct page *page, int cpupid); +extern int folio_cpupid_xchg_last(struct folio *folio, int cpupid); static inline void page_cpupid_reset_last(struct page *page) { @@ -1714,8 +1714,8 @@ static inline int xchg_folio_access_time(struct folio *folio, int time) { int last_time; - last_time = page_cpupid_xchg_last(&folio->page, - time >> PAGE_ACCESS_TIME_BUCKETS); + last_time = folio_cpupid_xchg_last(folio, + time >> PAGE_ACCESS_TIME_BUCKETS); return last_time << PAGE_ACCESS_TIME_BUCKETS; } @@ -1729,9 +1729,9 @@ static inline void vma_set_access_pid_bit(struct vm_area_struct *vma) } } #else /* !CONFIG_NUMA_BALANCING */ -static inline int page_cpupid_xchg_last(struct page *page, int cpupid) +static inline int folio_cpupid_xchg_last(struct folio *folio, int cpupid) { - return page_to_nid(page); /* XXX */ + return folio_nid(folio); /* XXX */ } static inline int xchg_folio_access_time(struct folio *folio, int time) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index afb9dc98a8ee..dca1546aa9c1 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -1810,7 +1810,7 @@ bool should_numa_migrate_memory(struct task_struct *p, struct folio *folio, } this_cpupid = cpu_pid_to_cpupid(dst_cpu, current->pid); - last_cpupid = page_cpupid_xchg_last(&folio->page, this_cpupid); + last_cpupid = folio_cpupid_xchg_last(folio, this_cpupid); if (!(sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING) && !node_is_toptier(src_nid) && !cpupid_valid(last_cpupid)) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 93981a759daf..89e65ff46ad4 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2508,7 +2508,7 @@ static void __split_huge_page_tail(struct folio *folio, int tail, if (page_is_idle(head)) set_page_idle(page_tail); - page_cpupid_xchg_last(page_tail, folio_cpupid_last(folio)); + folio_cpupid_xchg_last(new_folio, folio_cpupid_last(folio)); /* * always add to the tail because some iterators expect new diff --git a/mm/memory.c b/mm/memory.c index 119c40e4465e..bf07ebdc24a0 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3030,7 +3030,7 @@ static inline void wp_page_reuse(struct vm_fault *vmf, struct folio *folio) * information potentially belongs to a now completely * unrelated process. */ - page_cpupid_xchg_last(vmf->page, (1 << LAST_CPUPID_SHIFT) - 1); + folio_cpupid_xchg_last(folio, (1 << LAST_CPUPID_SHIFT) - 1); } flush_cache_page(vma, vmf->address, pte_pfn(vmf->orig_pte)); diff --git a/mm/migrate.c b/mm/migrate.c index 7d1804c4a5d9..d41139ccbd3f 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -588,7 +588,7 @@ void folio_migrate_flags(struct folio *newfolio, struct folio *folio) * Copy NUMA information to the new page, to prevent over-eager * future migrations of this same page. */ - cpupid = page_cpupid_xchg_last(&folio->page, -1); + cpupid = folio_cpupid_xchg_last(folio, -1); /* * For memory tiering mode, when migrate between slow and fast * memory node, reset cpupid, because that is used to record @@ -601,7 +601,7 @@ void folio_migrate_flags(struct folio *newfolio, struct folio *folio) if (f_toptier != t_toptier) cpupid = -1; } - page_cpupid_xchg_last(&newfolio->page, cpupid); + folio_cpupid_xchg_last(newfolio, cpupid); folio_migrate_ksm(newfolio, folio); /* diff --git a/mm/mmzone.c b/mm/mmzone.c index 68e1511be12d..cd473f82b647 100644 --- a/mm/mmzone.c +++ b/mm/mmzone.c @@ -93,19 +93,19 @@ void lruvec_init(struct lruvec *lruvec) } #if defined(CONFIG_NUMA_BALANCING) && !defined(LAST_CPUPID_NOT_IN_PAGE_FLAGS) -int page_cpupid_xchg_last(struct page *page, int cpupid) +int folio_cpupid_xchg_last(struct folio *folio, int cpupid) { unsigned long old_flags, flags; int last_cpupid; - old_flags = READ_ONCE(page->flags); + old_flags = READ_ONCE(folio->flags); do { flags = old_flags; last_cpupid = (flags >> LAST_CPUPID_PGSHIFT) & LAST_CPUPID_MASK; flags &= ~(LAST_CPUPID_MASK << LAST_CPUPID_PGSHIFT); flags |= (cpupid & LAST_CPUPID_MASK) << LAST_CPUPID_PGSHIFT; - } while (unlikely(!try_cmpxchg(&page->flags, &old_flags, flags))); + } while (unlikely(!try_cmpxchg(&folio->flags, &old_flags, flags))); return last_cpupid; }