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 1C605EE4993 for ; Wed, 23 Aug 2023 13:15:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A086E90002B; Wed, 23 Aug 2023 09:15:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B8DB8E0011; Wed, 23 Aug 2023 09:15:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8809590002B; Wed, 23 Aug 2023 09:15:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 775D98E0011 for ; Wed, 23 Aug 2023 09:15:19 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 4138E80114 for ; Wed, 23 Aug 2023 13:15:19 +0000 (UTC) X-FDA: 81155415558.14.87F1108 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf20.hostedemail.com (Postfix) with ESMTP id 81BEC1C002B for ; Wed, 23 Aug 2023 13:15:17 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf20.hostedemail.com: domain of alexandru.elisei@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=alexandru.elisei@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1692796517; 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=FxMdaHr1rl+oIUwSSlfEqiIEz4TCyf52oqI+OCU1h+k=; b=cHuQMu5yxtLDPJEK4DOkptQLxnHbzeRT4LzmyIH5WdibEHyM+jUQBeC6yd6EOPI611HItE pahLNagDgpXdp76DlnIAAnx7nQ726cDBh8Xou1WjfAFF/smSn3isXIMrTcYJaycsffGgeu 6hgw5tn90dXkMZX3CtvjzVrrVDGtJm8= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf20.hostedemail.com: domain of alexandru.elisei@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=alexandru.elisei@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1692796517; a=rsa-sha256; cv=none; b=KkYGi3eUcMSb82YKSy9nyGhmWgVyjv63t6xaxWo2iXu5xYLsa8ynRk6ATnR+gxFV2yv6LQ ECkycW1Ruh4KWXcxt0ZoZabjgAtH46gzDeEP5TRWF+EPIyNvNxbtOCSmouHDkyMW0bMv1m LuSBmtb34beZCreU+uqF/5984fUsPzs= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 72F7D15BF; Wed, 23 Aug 2023 06:15:52 -0700 (PDT) Received: from e121798.cable.virginm.net (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 69A753F740; Wed, 23 Aug 2023 06:15:05 -0700 (PDT) From: Alexandru Elisei To: catalin.marinas@arm.com, will@kernel.org, oliver.upton@linux.dev, maz@kernel.org, james.morse@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, arnd@arndb.de, akpm@linux-foundation.org, mingo@redhat.com, peterz@infradead.org, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, mgorman@suse.de, bristot@redhat.com, vschneid@redhat.com, mhiramat@kernel.org, rppt@kernel.org, hughd@google.com Cc: pcc@google.com, steven.price@arm.com, anshuman.khandual@arm.com, vincenzo.frascino@arm.com, david@redhat.com, eugenis@google.com, kcc@google.com, hyesoo.yu@samsung.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kvmarm@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org Subject: [PATCH RFC 10/37] mm: compaction: Do not use MIGRATE_METADATA to replace pages with metadata Date: Wed, 23 Aug 2023 14:13:23 +0100 Message-Id: <20230823131350.114942-11-alexandru.elisei@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230823131350.114942-1-alexandru.elisei@arm.com> References: <20230823131350.114942-1-alexandru.elisei@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 81BEC1C002B X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: r9dcco87h4ydcs3o5sfesj8zm66suo3e X-HE-Tag: 1692796517-321475 X-HE-Meta: U2FsdGVkX1/STRGfXs4T29bbu82wKd9urizQLoYQqUb489LZEElXoAF6aKWncPIXF2gFpGvreqUvxMej9WTFCFpnRS/qmovL8ttKvTu4wnn6t21mdr2MZag0b43e18XUjhSF0hGUZxAnxdunkdDw2twJ7YaPoMZeRih5nGbC5hWTR/AMqxJNumnDQAv+D6EGHA7GG31O8AVRquaVoAyVSbvwJS4yY5Zs62VDcfzEfTZoOXzvG2K9oadEy3+qAg6i9XjyhXxX57OpGcvVStFxz8Pc8kDLv2Qrjqu0CxxehWYSwLr1FsawiyId3HmGW+Yz2nViMJqkLzw9WIl5P9ctxd2bbt8lC2888/MkYYWXlhQeCOmjwBqZxAwaoGXedclfIgHFbmF+FwBIc0XBeiWYXnC5dqfx7zzIIreBOWkhLBO43Cu2sJPE0DHlu3GBSe1Sxb53UDI1zL8o2YatFwkZbZLZMrkhKjeUrPpa+9nCc1uhtrTEXdS7140n/vXKQf+huE7WBPtJlPUaVqd6JhHbfTIZrM5RPwqNKRSodRg4vfeka4xL04dhVLMOFBreR66LX/tTG7s/MB1IX7M81ZC7Vmee8OdMRoXxBQ+ZiEAugylfgOf1AEKBaQkU1PlQ53y1Fi5rrMPPvFQibiZjpqA2IxB5ZgEn8Vf545rm7UVok4Z/wysFDKuN0xv6dnCcfgwOZGCfrtXk7HeTBnkRnvh5YTZOqxDoN8SyPRIJhC/95U3hqztUnhofnDxNEr1qsZEhHAlMN2Ef7cvx0G4OschQ0sT0zhs3XAz+fzXYAu+llDUBhl5oHRdwH0JpP8Wf9Fc6ctoaKEtPtZlxq6EP6Z6n5ZWRmzYR5Hh0xIfuBexQ+OmDWd5h666g0qE1S1BOxwuiNvnmtXPRcPqVOo6VPnuArajfLI0JPPSo6MlxMb7PuiyDEf0wRGe6mEgmrz19VAteQG+doDJPF41l/l1SwpL c1PoprGP 8NCEZ3pVdCaqlgPjkfdBjdtOsZVPyOUDjBsD/FvrMNqnWr3eNeYNTGrdyJ+1xsqIc7P1FVZAAK/bWPFRHrnMCBwaB/AyONdCY7Tj/Tbn51R49wWdc0SVA0VZA4jDdDKDsvk7Or2XqeoE5lNk97CUPwZTVHudImxXmwZxVpObpdCwpq4YRDcB4SczmtGzhCuB96GqBjhxhbJuCAgIgTK1ML1y21c0jbj+PxRqGVPkqFXLoeJALVuhP3vsxYw== 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: MIGRATE_METADATA pages are special because for the one architecture (arm64) that use them, it is not possible to have metadata associated with a page used to store metadata. To avoid a situation where a page with metadata is being migrated to a page which cannot have metadata, keep track of whether such pages have been isolated as the source for migration. When allocating a destination page for migration, deny allocations from MIGRATE_METADATA if that's the case. fast_isolate_freepages() takes pages only from the MIGRATE_MOVABLE list, which means it is not necessary to have a similar check, as MIGRATE_METADATA pages will never be considered. Signed-off-by: Alexandru Elisei --- arch/arm64/include/asm/memory_metadata.h | 5 +++++ include/asm-generic/memory_metadata.h | 5 +++++ include/linux/mmzone.h | 2 +- mm/compaction.c | 19 +++++++++++++++++-- mm/internal.h | 1 + 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/arch/arm64/include/asm/memory_metadata.h b/arch/arm64/include/asm/memory_metadata.h index 5269be7f455f..c57c435c8ba3 100644 --- a/arch/arm64/include/asm/memory_metadata.h +++ b/arch/arm64/include/asm/memory_metadata.h @@ -7,6 +7,8 @@ #include +#include + #ifdef CONFIG_MEMORY_METADATA static inline bool metadata_storage_enabled(void) { @@ -16,6 +18,9 @@ static inline bool alloc_can_use_metadata_pages(gfp_t gfp_mask) { return false; } + +#define page_has_metadata(page) page_mte_tagged(page) + #endif /* CONFIG_MEMORY_METADATA */ #endif /* __ASM_MEMORY_METADATA_H */ diff --git a/include/asm-generic/memory_metadata.h b/include/asm-generic/memory_metadata.h index 63ea661b354d..02b279823920 100644 --- a/include/asm-generic/memory_metadata.h +++ b/include/asm-generic/memory_metadata.h @@ -3,6 +3,7 @@ #define __ASM_GENERIC_MEMORY_METADATA_H #include +#include extern unsigned long totalmetadata_pages; @@ -15,6 +16,10 @@ static inline bool alloc_can_use_metadata_pages(gfp_t gfp_mask) { return false; } +static inline bool page_has_metadata(struct page *page) +{ + return false; +} #endif /* !CONFIG_MEMORY_METADATA */ #endif /* __ASM_GENERIC_MEMORY_METADATA_H */ diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 48c237248d87..12d5072668ab 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -91,7 +91,7 @@ extern const char * const migratetype_names[MIGRATE_TYPES]; static inline bool is_migrate_movable(int mt) { - return is_migrate_cma(mt) || mt == MIGRATE_MOVABLE; + return is_migrate_cma(mt) || is_migrate_metadata(mt) || mt == MIGRATE_MOVABLE; } /* diff --git a/mm/compaction.c b/mm/compaction.c index a29db409c5cc..cc0139fa0cb0 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1153,6 +1153,9 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn, nr_isolated += folio_nr_pages(folio); nr_scanned += folio_nr_pages(folio) - 1; + if (page_has_metadata(&folio->page)) + cc->source_has_metadata = true; + /* * Avoid isolating too much unless this block is being * fully scanned (e.g. dirty/writeback pages, parallel allocation) @@ -1328,6 +1331,15 @@ static bool suitable_migration_source(struct compact_control *cc, static bool suitable_migration_target(struct compact_control *cc, struct page *page) { + int block_mt; + + block_mt = get_pageblock_migratetype(page); + + /* Pages from MIGRATE_METADATA cannot have metadata. */ + if (is_migrate_metadata(block_mt) && cc->source_has_metadata) + return false; + + /* If the page is a large free page, then disallow migration */ if (PageBuddy(page)) { /* @@ -1342,8 +1354,11 @@ static bool suitable_migration_target(struct compact_control *cc, if (cc->ignore_block_suitable) return true; - /* If the block is MIGRATE_MOVABLE or MIGRATE_CMA, allow migration */ - if (is_migrate_movable(get_pageblock_migratetype(page))) + /* + * If the block is MIGRATE_MOVABLE, MIGRATE_CMA or MIGRATE_METADATA, + * allow migration. + */ + if (is_migrate_movable(block_mt)) return true; /* Otherwise skip the block */ diff --git a/mm/internal.h b/mm/internal.h index efd52c9f1578..d28ac0085f61 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -491,6 +491,7 @@ struct compact_control { * ensure forward progress. */ bool alloc_contig; /* alloc_contig_range allocation */ + bool source_has_metadata; /* source pages have associated metadata */ }; /* -- 2.41.0