From patchwork Sat Aug 19 10:52:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13358591 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 4DB6AEE49AC for ; Sat, 19 Aug 2023 10:52:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A834D90000C; Sat, 19 Aug 2023 06:52:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A3332900004; Sat, 19 Aug 2023 06:52:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9216B90000C; Sat, 19 Aug 2023 06:52:53 -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 83EA8900004 for ; Sat, 19 Aug 2023 06:52:53 -0400 (EDT) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 51171120843 for ; Sat, 19 Aug 2023 10:52:53 +0000 (UTC) X-FDA: 81140541426.29.D08AABC Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) by imf27.hostedemail.com (Postfix) with ESMTP id 5848540009 for ; Sat, 19 Aug 2023 10:52:49 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf27.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.130 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692442370; 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; bh=7UucgbnKEMrd4OyT3sJC+JcNECE5MZSvFXPNqHzVTco=; b=0lbT6i6WrDeKENRAshJqsSfhH8q9NkKuzXlOy3pUHMWn5Q4eyQ27ceUJhvLMdDYxUGxPH/ uRR/YPm8WwZ6jxx4njU++8rB3Kg0M0qzesu/1g6Vgvqkzaf354JKjCm8wckecm6NneQADi O9rrcSrM0RMiptLGPlowf3040twWbDA= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=alibaba.com; spf=pass (imf27.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.130 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692442370; a=rsa-sha256; cv=none; b=veN3OEqkqNG8+6OwPN6S+KG6M7oicEwFDU22Jk264/23M6eqe/rmEwYDT7/QHmxlboRB2A YdlyFOiBKc3OXa7KAzybrJS3B5tAw5dhflOpo2oA77XA3tQxebRUYtztHQLK2YHK3mc5wK HbM4uBWRfho9oQj/itFLmflhN54tPho= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R131e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046050;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=8;SR=0;TI=SMTPD_---0Vq58.Rv_1692442362; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0Vq58.Rv_1692442362) by smtp.aliyun-inc.com; Sat, 19 Aug 2023 18:52:43 +0800 From: Baolin Wang To: akpm@linux-foundation.org Cc: mgorman@techsingularity.net, shy828301@gmail.com, david@redhat.com, ying.huang@intel.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] mm: migrate: move migration validation into numa_migrate_prep() Date: Sat, 19 Aug 2023 18:52:34 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: 5848540009 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: spopyhoezqwn36ys7fs868gg6yo7k9hu X-HE-Tag: 1692442369-183195 X-HE-Meta: U2FsdGVkX1//dlfww7fl0yFOVcHpZUElTUOssefseBznvtCnhUyBy8fZvftneyfmGFywqZouXqN/wZtg1imIdRgNdde/t/UPm2m1aHAhou7mqc1qlFS4nUyq4yum04SanTt+/Zedqj40a7Q14eEWtdwnNIe0xUnoMA26J3+EVQj8zb7TgiJVXFTVWQ02eLZ/3/9aOLF2zRVuBZjTjbXKlp84H8E1xxX/sATyUUo3xiM0YEEdL4CrHSPFwTK+XvpoTyq4KMrY7SgwT/fe9FwqhrekLSqfaMKN53sCBal64XXtjmmxVROEjAwgshhRrDe5j3e4oivYfA4KCL9kl9y7z+GvSXLdWeoMyr2YmEqg9HzjFk5m08PfFfRIFDich+pIKcTeG0waNLLrPeqYc9MEzjAIpRvFRYSaPAW9OnwVXwe5r4fRwYJq1z8DY1kth5TYoKgRgA7jpfe31o9Qb3FUd8CDCKEgT348fILn+roFokOllFlrK0NYcFedebdq7LaLepLuIQHweItLRsFnjBByr7VCgyxh69lK1ehN8DeZkxw7bNTlDj/NQpncY7FuRc6kSquz8Qyx82THONo2b97LYSJa5gNUQ9XCmH31Daxi+nSccaVrxgQjFYGo4mBQ0b0ApxUVRkf67bjNpwfjZgEsfERTAss6djjBfttJ9JiOO61M++K29V4ORfalPBryAqfYS/CE35htJVI2K6eDRwRCcYYD6RaUR9qDqjgKuihX+SnyHcpKMJLEMFMX03b6M6nXFATSfmBthWpLffwXli5sYwsT2qTyX2boOTgCkh7zS0mD0zQR6xsgJ5szlOk/G5h138OjLrjqz+3pe6MWOVCJrQgFA3mVDdtrYoT/4YM6Y9hk1Ub/n6QgDmlncf+0fMAXFyjS9mEdmMqrP1y5g1JwYYku8mQwfzXcW9DmewUIYkF2t6BTOvxXELNaJ4IFalgAx2t3GWw8H17nUC8sy3v 9oUQl9cN cVUiXjOWazv9BffHxuXRxvuXqbeBg3PoRWZ2a4QXnuAAEGOYva50ecNgIP5N7B2/XGPG/GjTDgA7IVhlzGjdD1QXbWMkE3MnCGZQ/2GvSuoNtxBVN4U+RGqaurLd7l7oXRgy288rS/GWa784= 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: Now there are 3 places will validate if a page can mirate or not, and some validations are performed later, which will waste some CPU to call numa_migrate_prep(). Thus we can move all the migration validation into numa_migrate_prep(), which is more maintainable as well as saving some CPU resources. Another benefit is that it can serve as a preparation for supporting batch migration in do_numa_page() in future. Signed-off-by: Baolin Wang --- mm/memory.c | 19 +++++++++++++++++++ mm/migrate.c | 19 ------------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index d003076b218d..bee9b1e86ef0 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4747,6 +4747,25 @@ int numa_migrate_prep(struct page *page, struct vm_area_struct *vma, *flags |= TNF_FAULT_LOCAL; } + /* + * Don't migrate file pages that are mapped in multiple processes + * with execute permissions as they are probably shared libraries. + */ + if (page_mapcount(page) != 1 && page_is_file_lru(page) && + (vma->vm_flags & VM_EXEC)) + return NUMA_NO_NODE; + + /* + * Also do not migrate dirty pages as not all filesystems can move + * dirty pages in MIGRATE_ASYNC mode which is a waste of cycles. + */ + if (page_is_file_lru(page) && PageDirty(page)) + return NUMA_NO_NODE; + + /* Do not migrate THP mapped by multiple processes */ + if (PageTransHuge(page) && total_mapcount(page) > 1) + return NUMA_NO_NODE; + return mpol_misplaced(page, vma, addr); } diff --git a/mm/migrate.c b/mm/migrate.c index e21d5a7e7447..9cc98fb1d6ec 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -2485,10 +2485,6 @@ static int numamigrate_isolate_page(pg_data_t *pgdat, struct page *page) VM_BUG_ON_PAGE(order && !PageTransHuge(page), page); - /* Do not migrate THP mapped by multiple processes */ - if (PageTransHuge(page) && total_mapcount(page) > 1) - return 0; - /* Avoid migrating to a node that is nearly full */ if (!migrate_balanced_pgdat(pgdat, nr_pages)) { int z; @@ -2533,21 +2529,6 @@ int migrate_misplaced_page(struct page *page, struct vm_area_struct *vma, LIST_HEAD(migratepages); int nr_pages = thp_nr_pages(page); - /* - * Don't migrate file pages that are mapped in multiple processes - * with execute permissions as they are probably shared libraries. - */ - if (page_mapcount(page) != 1 && page_is_file_lru(page) && - (vma->vm_flags & VM_EXEC)) - goto out; - - /* - * Also do not migrate dirty pages as not all filesystems can move - * dirty pages in MIGRATE_ASYNC mode which is a waste of cycles. - */ - if (page_is_file_lru(page) && PageDirty(page)) - goto out; - isolated = numamigrate_isolate_page(pgdat, page); if (!isolated) goto out;